From c9dbaed92c20bdbfaae5c0325e950b295a18752b Mon Sep 17 00:00:00 2001 From: ZackGu Date: Sun, 21 Jan 2024 23:19:26 +0800 Subject: [PATCH] Fix bug --- .github/workflows/x86-immortalWRT.yml | 2 +- config/x86-immortalWRT.config | 60 ++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/.github/workflows/x86-immortalWRT.yml b/.github/workflows/x86-immortalWRT.yml index fc84ba74..f292157a 100644 --- a/.github/workflows/x86-immortalWRT.yml +++ b/.github/workflows/x86-immortalWRT.yml @@ -21,7 +21,7 @@ env: CONFIG_FILE: config/x86-immortalWRT.config FEEDS_SH: feeds-x86-imWRT.sh CUSTOM_SH: custom.sh - DVC_NAME: x86 + DVC_NAME: OpenWRT DVC_IP: 192.168.121.1 UPLOAD_BIN_DIR: true UPLOAD_FIRMWARE: true diff --git a/config/x86-immortalWRT.config b/config/x86-immortalWRT.config index 78b110d3..7fab907f 100644 --- a/config/x86-immortalWRT.config +++ b/config/x86-immortalWRT.config @@ -19,6 +19,7 @@ CONFIG_LIBCURL_TFTP=y CONFIG_LIBCURL_THREADED_RESOLVER=y CONFIG_LIBCURL_TLS_SRP=y CONFIG_LIBCURL_UNIX_SOCKETS=y +CONFIG_LIBSODIUM_MINIMAL=y CONFIG_LUCI_LANG_zh_Hans=y CONFIG_PACKAGE_alist=y CONFIG_PACKAGE_aria2=y @@ -28,31 +29,47 @@ CONFIG_PACKAGE_boost=y CONFIG_PACKAGE_boost-system=y CONFIG_PACKAGE_btrfs-progs=y CONFIG_PACKAGE_cgi-io=y +CONFIG_PACKAGE_chinadns-ng=y CONFIG_PACKAGE_coreutils=y CONFIG_PACKAGE_coreutils-base64=y CONFIG_PACKAGE_coreutils-nohup=y CONFIG_PACKAGE_curl=y CONFIG_PACKAGE_default-settings=y CONFIG_PACKAGE_default-settings-chn=y +CONFIG_PACKAGE_dns2socks=y +CONFIG_PACKAGE_dns2tcp=y +CONFIG_PACKAGE_dnsmasq_full_ipset=y CONFIG_PACKAGE_etherwake=y CONFIG_PACKAGE_frpc=y CONFIG_PACKAGE_fuse-utils=y CONFIG_PACKAGE_glib2=y CONFIG_PACKAGE_haproxy=y CONFIG_PACKAGE_ip-full=y +CONFIG_PACKAGE_ipset=y +CONFIG_PACKAGE_iptables-mod-tproxy=y +CONFIG_PACKAGE_iptables-nft=y CONFIG_PACKAGE_kmod-crypto-acompress=y CONFIG_PACKAGE_kmod-fs-btrfs=y CONFIG_PACKAGE_kmod-fuse=y +CONFIG_PACKAGE_kmod-inet-diag=y +CONFIG_PACKAGE_kmod-ipt-core=y +CONFIG_PACKAGE_kmod-ipt-ipset=y +CONFIG_PACKAGE_kmod-ipt-nat=y +CONFIG_PACKAGE_kmod-ipt-tproxy=y CONFIG_PACKAGE_kmod-lib-lzo=y CONFIG_PACKAGE_kmod-lib-raid6=y CONFIG_PACKAGE_kmod-lib-xor=y CONFIG_PACKAGE_kmod-lib-zlib-deflate=y CONFIG_PACKAGE_kmod-lib-zlib-inflate=y CONFIG_PACKAGE_kmod-lib-zstd=y +CONFIG_PACKAGE_kmod-netlink-diag=y +CONFIG_PACKAGE_kmod-nf-ipt=y CONFIG_PACKAGE_kmod-nf-socket=y CONFIG_PACKAGE_kmod-nf-tproxy=y +CONFIG_PACKAGE_kmod-nft-compat=y CONFIG_PACKAGE_kmod-nft-socket=y CONFIG_PACKAGE_kmod-nft-tproxy=y +CONFIG_PACKAGE_kmod-tun=y CONFIG_PACKAGE_krb5-libs=y CONFIG_PACKAGE_libQt6Core=y CONFIG_PACKAGE_libQt6Network=y @@ -66,12 +83,14 @@ CONFIG_PACKAGE_libcap-ng=y CONFIG_PACKAGE_libcurl=y CONFIG_PACKAGE_libdouble-conversion=y CONFIG_PACKAGE_libelf=y +CONFIG_PACKAGE_libev=y CONFIG_PACKAGE_libevdev=y -CONFIG_PACKAGE_libevent2=y -CONFIG_PACKAGE_libevent2-core=y -CONFIG_PACKAGE_libevent2-openssl=y CONFIG_PACKAGE_libffi=y CONFIG_PACKAGE_libfuse=y +CONFIG_PACKAGE_libipset=y +CONFIG_PACKAGE_libiptext=y +CONFIG_PACKAGE_libiptext-nft=y +CONFIG_PACKAGE_libiptext6=y CONFIG_PACKAGE_libiwinfo=y CONFIG_PACKAGE_libiwinfo-data=y CONFIG_PACKAGE_libltdl=y @@ -84,19 +103,24 @@ CONFIG_PACKAGE_liblzo=y CONFIG_PACKAGE_libmount=y CONFIG_PACKAGE_libnghttp2=y CONFIG_PACKAGE_libparted=y +CONFIG_PACKAGE_libpcre=y CONFIG_PACKAGE_libpcre2=y CONFIG_PACKAGE_libpcre2-16=y CONFIG_PACKAGE_libreadline=y +CONFIG_PACKAGE_libsodium=y CONFIG_PACKAGE_libsqlite3=y CONFIG_PACKAGE_libstdcpp=y CONFIG_PACKAGE_libtorrent-rasterbar=y CONFIG_PACKAGE_libubus-lua=y CONFIG_PACKAGE_libuci-lua=y CONFIG_PACKAGE_libudev-zero=y +CONFIG_PACKAGE_libudns=y CONFIG_PACKAGE_libuv=y CONFIG_PACKAGE_libwebsockets-full=y +CONFIG_PACKAGE_libxtables=y CONFIG_PACKAGE_lsblk=y CONFIG_PACKAGE_lua=y +CONFIG_PACKAGE_lua-neturl=y CONFIG_PACKAGE_luci=y CONFIG_PACKAGE_luci-app-accesscontrol=y CONFIG_PACKAGE_luci-app-alist=y @@ -105,20 +129,25 @@ CONFIG_PACKAGE_luci-app-arpbind=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-firewall=y CONFIG_PACKAGE_luci-app-frpc=y -CONFIG_PACKAGE_luci-app-nlbwmon=y CONFIG_PACKAGE_luci-app-opkg=y CONFIG_PACKAGE_luci-app-passwall2=y # CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_ShadowsocksR_Libev_Client is not set # CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Libev_Client is not set # CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Simple_Obfs is not set -# CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_SingBox is not set # CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_V2ray_Plugin is not set CONFIG_PACKAGE_luci-app-passwall2_Nftables_Transparent_Proxy=y CONFIG_PACKAGE_luci-app-qbittorrent=y +CONFIG_PACKAGE_luci-app-ssr-plus=y +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Libev_Client is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Libev_Server is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Libev_Server is not set +CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_NONE_Client=y +CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_NONE_Server=y +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Rust_Client is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Simple_Obfs is not set CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-upnp=y CONFIG_PACKAGE_luci-app-wolplus=y -CONFIG_PACKAGE_luci-app-xfrpc=y CONFIG_PACKAGE_luci-base=y CONFIG_PACKAGE_luci-compat=y CONFIG_PACKAGE_luci-i18n-accesscontrol-zh-cn=y @@ -129,15 +158,16 @@ CONFIG_PACKAGE_luci-i18n-base-zh-cn=y CONFIG_PACKAGE_luci-i18n-diskman-zh-cn=y CONFIG_PACKAGE_luci-i18n-firewall-zh-cn=y CONFIG_PACKAGE_luci-i18n-frpc-zh-cn=y -CONFIG_PACKAGE_luci-i18n-nlbwmon-zh-cn=y CONFIG_PACKAGE_luci-i18n-opkg-zh-cn=y CONFIG_PACKAGE_luci-i18n-passwall2-zh-cn=y CONFIG_PACKAGE_luci-i18n-qbittorrent-zh-cn=y +CONFIG_PACKAGE_luci-i18n-ssr-plus-zh-cn=y CONFIG_PACKAGE_luci-i18n-ttyd-zh-cn=y CONFIG_PACKAGE_luci-i18n-upnp-zh-cn=y -CONFIG_PACKAGE_luci-i18n-xfrpc-zh-cn=y +CONFIG_PACKAGE_luci-i18n-wolplus-zh-cn=y CONFIG_PACKAGE_luci-lib-base=y CONFIG_PACKAGE_luci-lib-ip=y +CONFIG_PACKAGE_luci-lib-ipkg=y CONFIG_PACKAGE_luci-lib-jsonc=y CONFIG_PACKAGE_luci-lib-nixio=y CONFIG_PACKAGE_luci-light=y @@ -150,8 +180,9 @@ CONFIG_PACKAGE_luci-proto-ipv6=y CONFIG_PACKAGE_luci-proto-ppp=y CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_luci-theme-bootstrap=y +CONFIG_PACKAGE_microsocks=y CONFIG_PACKAGE_miniupnpd-nftables=y -CONFIG_PACKAGE_nlbwmon=y +CONFIG_PACKAGE_mosdns=y CONFIG_PACKAGE_parted=y CONFIG_PACKAGE_qbittorrent-enhanced-edition=y CONFIG_PACKAGE_qemu-ga=y @@ -164,6 +195,8 @@ CONFIG_PACKAGE_rpcd-mod-iwinfo=y CONFIG_PACKAGE_rpcd-mod-luci=y CONFIG_PACKAGE_rpcd-mod-rrdns=y CONFIG_PACKAGE_rpcd-mod-ucode=y +CONFIG_PACKAGE_shadowsocksr-libev-ssr-check=y +CONFIG_PACKAGE_sing-box=y CONFIG_PACKAGE_smartmontools=y CONFIG_PACKAGE_tcping=y CONFIG_PACKAGE_ttyd=y @@ -176,12 +209,19 @@ CONFIG_PACKAGE_unzip=y CONFIG_PACKAGE_v2ray-geoip=y CONFIG_PACKAGE_v2ray-geosite=y CONFIG_PACKAGE_virtio-console-helper=y -CONFIG_PACKAGE_xfrpc=y CONFIG_PACKAGE_xray-core=y +CONFIG_PACKAGE_xtables-nft=y CONFIG_PACKAGE_zlib=y CONFIG_PARTED_READLINE=y CONFIG_PCRE2_JIT_ENABLED=y +CONFIG_PCRE_JIT_ENABLED=y CONFIG_QCOW2_IMAGES=y +CONFIG_SING_BOX_BUILD_CLASH_API=y +CONFIG_SING_BOX_BUILD_ECH=y +CONFIG_SING_BOX_BUILD_GVISOR=y +CONFIG_SING_BOX_BUILD_QUIC=y +CONFIG_SING_BOX_BUILD_UTLS=y +CONFIG_SING_BOX_BUILD_WIREGUARD=y CONFIG_SQLITE3_COLUMN_METADATA=y CONFIG_SQLITE3_DYNAMIC_EXTENSIONS=y CONFIG_SQLITE3_FTS3=y