diff --git a/.github/workflows/Build-x86_64.yml b/.github/workflows/Build-x86_64.yml index 2a24978..abd2608 100644 --- a/.github/workflows/Build-x86_64.yml +++ b/.github/workflows/Build-x86_64.yml @@ -21,7 +21,7 @@ on: env: REPO_URL: https://github.com/coolsnowwolf/lede.git - REPO_BRANCH: 20220716 + REPO_BRANCH: 20221001 FEEDS_CONF: feeds.conf.default CONFIG_FILE: x86_64.config DIY_P1_SH: devices/x86_64/diy-part1.sh diff --git a/config/x86_64.config b/config/x86_64.config index 17e3534..c7c3bbc 100644 --- a/config/x86_64.config +++ b/config/x86_64.config @@ -5,7 +5,6 @@ CONFIG_ARIA2_BITTORRENT=y CONFIG_ARIA2_NOXML=y CONFIG_ARIA2_OPENSSL=y CONFIG_ARIA2_WEBSOCKET=y -CONFIG_BIND_ENABLE_DOH=y # CONFIG_GRUB_EFI_IMAGES is not set CONFIG_GRUB_IMAGES=y CONFIG_PACKAGE_6in4=y @@ -18,49 +17,61 @@ CONFIG_PACKAGE_alsa-utils=y CONFIG_PACKAGE_appfilter=y CONFIG_PACKAGE_aria2=y CONFIG_PACKAGE_ariang=y -CONFIG_PACKAGE_avahi-dbus-daemon=y CONFIG_PACKAGE_bash=y -CONFIG_PACKAGE_bind-dig=y -CONFIG_PACKAGE_bind-libs=y +# CONFIG_PACKAGE_blkid is not set CONFIG_PACKAGE_boost=y CONFIG_PACKAGE_boost-program_options=y CONFIG_PACKAGE_boost-system=y CONFIG_PACKAGE_brook=y -CONFIG_PACKAGE_chinadns-ng=y CONFIG_PACKAGE_coreutils-nohup=y -CONFIG_PACKAGE_dbus=y CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y +CONFIG_PACKAGE_ddns-scripts_no-ip_com=y CONFIG_PACKAGE_dnsforwarder=y CONFIG_PACKAGE_dnsproxy=y +CONFIG_PACKAGE_eject=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_frpc=y CONFIG_PACKAGE_fuse-utils=y -CONFIG_PACKAGE_gdisk=y # CONFIG_PACKAGE_grub2-efi is not set CONFIG_PACKAGE_haproxy=y CONFIG_PACKAGE_hysteria=y CONFIG_PACKAGE_ip6tables=y -CONFIG_PACKAGE_ip6tables-mod-nat=y -CONFIG_PACKAGE_iperf3=y +CONFIG_PACKAGE_ipt2socks=y +CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y +CONFIG_PACKAGE_iptables-mod-iprange=y CONFIG_PACKAGE_iputils-arping=y CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_jq=y CONFIG_PACKAGE_kmod-ac97=y # CONFIG_PACKAGE_kmod-crypto-kpp is not set -CONFIG_PACKAGE_kmod-fast-classifier=y CONFIG_PACKAGE_kmod-fuse=y CONFIG_PACKAGE_kmod-ifb=y CONFIG_PACKAGE_kmod-inet-diag=y +CONFIG_PACKAGE_kmod-ip6tables=y +CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y CONFIG_PACKAGE_kmod-ipt-ipopt=y +CONFIG_PACKAGE_kmod-ipt-iprange=y CONFIG_PACKAGE_kmod-ipt-nat6=y +CONFIG_PACKAGE_kmod-ipt-offload=y CONFIG_PACKAGE_kmod-iptunnel=y CONFIG_PACKAGE_kmod-ledtrig-audio=y # CONFIG_PACKAGE_kmod-nf-conntrack-netlink is not set +CONFIG_PACKAGE_kmod-nf-flow=y +CONFIG_PACKAGE_kmod-nf-ipt6=y +CONFIG_PACKAGE_kmod-nf-log6=y CONFIG_PACKAGE_kmod-nf-nat6=y +CONFIG_PACKAGE_kmod-nf-reject6=y +CONFIG_PACKAGE_kmod-nf-socket=y +CONFIG_PACKAGE_kmod-nft-core=y +CONFIG_PACKAGE_kmod-nft-nat=y +CONFIG_PACKAGE_kmod-nft-socket=y +CONFIG_PACKAGE_kmod-nft-tproxy=y +CONFIG_PACKAGE_kmod-oaf=y CONFIG_PACKAGE_kmod-regmap-core=y CONFIG_PACKAGE_kmod-sched-cake=y CONFIG_PACKAGE_kmod-sched-core=y +# CONFIG_PACKAGE_kmod-shortcut-fe is not set # CONFIG_PACKAGE_kmod-shortcut-fe-cm is not set CONFIG_PACKAGE_kmod-sit=y CONFIG_PACKAGE_kmod-sound-core=y @@ -74,20 +85,13 @@ CONFIG_PACKAGE_kmod-sound-mpu401=y CONFIG_PACKAGE_kmod-sound-via82xx=y CONFIG_PACKAGE_kmod-usb-audio=y # CONFIG_PACKAGE_kmod-wireguard is not set -CONFIG_PACKAGE_libatomic=y -CONFIG_PACKAGE_libavahi-client=y -CONFIG_PACKAGE_libavahi-dbus-support=y CONFIG_PACKAGE_libcap-bin=y CONFIG_PACKAGE_libcap-bin-capsh-shell="/bin/sh" CONFIG_PACKAGE_libconfig=y -CONFIG_PACKAGE_libdaemon=y -CONFIG_PACKAGE_libdbus=y -CONFIG_PACKAGE_libexpat=y CONFIG_PACKAGE_libfuse=y CONFIG_PACKAGE_libltdl=y CONFIG_PACKAGE_liblua5.3=y -CONFIG_PACKAGE_libnghttp2=y -CONFIG_PACKAGE_libpopt=y +# CONFIG_PACKAGE_libparted is not set CONFIG_PACKAGE_libruby=y CONFIG_PACKAGE_libsoxr=y CONFIG_PACKAGE_libyaml=y @@ -107,43 +111,39 @@ CONFIG_PACKAGE_luci-app-aria2=y # CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Socks_Server is not set # CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Trojan is not set # CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Xray is not set -# CONFIG_PACKAGE_luci-app-diskman_INCLUDE_lsblk is not set +# CONFIG_PACKAGE_luci-app-diskman is not set CONFIG_PACKAGE_luci-app-eqos=y CONFIG_PACKAGE_luci-app-frpc=y # CONFIG_PACKAGE_luci-app-nlbwmon is not set CONFIG_PACKAGE_luci-app-oaf=y CONFIG_PACKAGE_luci-app-openclash=y CONFIG_PACKAGE_luci-app-passwall=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_V2ray_Plugin is not set -# CONFIG_PACKAGE_luci-app-passwall2_Transparent_Proxy is not set CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Brook=y +CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ChinaDNS_NG=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Hysteria=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_IPv6_Nat=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_NaiveProxy=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR_Libev_Server=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Rust_Client=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Rust_Server=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan_GO=y +CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Geodata=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=y +CONFIG_PACKAGE_luci-app-passwall_Iptables_Transparent_Proxy=y +CONFIG_PACKAGE_luci-app-passwall_Nftables_Transparent_Proxy=y CONFIG_PACKAGE_luci-app-pushbot=y CONFIG_PACKAGE_luci-app-qbittorrent=y +CONFIG_PACKAGE_luci-app-ramfree=y CONFIG_PACKAGE_luci-app-rclone=y CONFIG_PACKAGE_luci-app-sqm=y # CONFIG_PACKAGE_luci-app-ssr-plus is not set -CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_NONE_V2RAY=y +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ChinaDNS_NG is not set # 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_Simple_Obfs is not set -# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Xray is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Simple_Obfs is not set CONFIG_PACKAGE_luci-app-tencentddns=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_DNSFORWARDER=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_DNSPROXY=y -CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_SHORTCUT_FE=y -# CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_SHORTCUT_FE_CM is not set +CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_OFFLOADING=y CONFIG_PACKAGE_luci-app-uhttpd=y # CONFIG_PACKAGE_luci-app-unblockmusic is not set # CONFIG_PACKAGE_luci-app-unblockmusic_INCLUDE_UnblockNeteaseMusic_Go is not set @@ -167,13 +167,14 @@ CONFIG_PACKAGE_luci-i18n-frpc-zh-cn=y CONFIG_PACKAGE_luci-i18n-oaf-zh-cn=y CONFIG_PACKAGE_luci-i18n-passwall-zh-cn=y CONFIG_PACKAGE_luci-i18n-qbittorrent-zh-cn=y +CONFIG_PACKAGE_luci-i18n-ramfree-zh-cn=y CONFIG_PACKAGE_luci-i18n-rclone-zh-cn=y CONFIG_PACKAGE_luci-i18n-sqm-zh-cn=y CONFIG_PACKAGE_luci-i18n-uhttpd-zh-cn=y CONFIG_PACKAGE_luci-i18n-watchcat-zh-cn=y +# CONFIG_PACKAGE_luci-lib-ipkg is not set CONFIG_PACKAGE_luci-proto-ipv6=y # CONFIG_PACKAGE_luci-proto-wireguard is not set -CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_naiveproxy=y CONFIG_PACKAGE_nano=y # CONFIG_PACKAGE_nlbwmon is not set @@ -181,6 +182,7 @@ CONFIG_PACKAGE_odhcp6c=y CONFIG_PACKAGE_odhcp6c_ext_cer_id=0 CONFIG_PACKAGE_odhcpd-ipv6only=y CONFIG_PACKAGE_odhcpd_ipv6only_ext_cer_id=0 +# CONFIG_PACKAGE_parted is not set CONFIG_PACKAGE_qBittorrent-static=y CONFIG_PACKAGE_rclone=y CONFIG_PACKAGE_rclone-config=y @@ -198,12 +200,11 @@ CONFIG_PACKAGE_ruby-psych=y CONFIG_PACKAGE_ruby-stringio=y CONFIG_PACKAGE_ruby-strscan=y CONFIG_PACKAGE_ruby-yaml=y -CONFIG_PACKAGE_shadowsocks-libev-ss-local=y -CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y CONFIG_PACKAGE_shadowsocks-rust-sslocal=y CONFIG_PACKAGE_shadowsocks-rust-ssserver=y # CONFIG_PACKAGE_shadowsocksr-libev-ssr-check is not set CONFIG_PACKAGE_shairport-sync-openssl=y +# CONFIG_PACKAGE_smartmontools is not set CONFIG_PACKAGE_socat=y CONFIG_PACKAGE_sqm-scripts=y CONFIG_PACKAGE_tc-tiny=y @@ -211,6 +212,8 @@ CONFIG_PACKAGE_trojan-go=y CONFIG_PACKAGE_trojan-plus=y CONFIG_PACKAGE_unzip=y CONFIG_PACKAGE_v2ray-core=y +CONFIG_PACKAGE_v2ray-geoip=y +CONFIG_PACKAGE_v2ray-geosite=y CONFIG_PACKAGE_v2ray-plugin=y # CONFIG_PACKAGE_vsftpd-alt is not set CONFIG_PACKAGE_watchcat=y @@ -219,7 +222,6 @@ CONFIG_PACKAGE_xray-plugin=y CONFIG_TARGET_EXT4_BLOCKSIZE=4096 CONFIG_TARGET_EXT4_BLOCKSIZE_4K=y CONFIG_TARGET_EXT4_RESERVED_PCT=0 -CONFIG_TARGET_IMAGES_GZIP=y CONFIG_TARGET_KERNEL_PARTSIZE=128 CONFIG_TARGET_ROOTFS_EXT4FS=y CONFIG_TARGET_ROOTFS_PARTSIZE=800