From 43f048ed59cd3846b55f1fdd919531f7ead24b0e Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Sun, 27 Jun 2021 00:31:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configs/Common | 19 +++++++++++++++++-- Configs/asus_rt-acrh17 | 2 -- Configs/d-team_newifi-d2 | 31 ++----------------------------- Configs/x86_64 | 24 ++++-------------------- Configs/xiaoyu_xy-c5 | 31 ++----------------------------- 5 files changed, 25 insertions(+), 82 deletions(-) diff --git a/Configs/Common b/Configs/Common index 79efa57..0468007 100644 --- a/Configs/Common +++ b/Configs/Common @@ -1,15 +1,30 @@ CONFIG_PACKAGE_bash=y +CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-app-argon-config=y CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-autoupdate=y CONFIG_PACKAGE_luci-app-dnsfilter=y +CONFIG_PACKAGE_luci-app-ddns=y +CONFIG_PACKAGE_ddns-scripts_aliyun=y +CONFIG_PACKAGE_ddns-scripts_dnspod=y +CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y +CONFIG_PACKAGE_ddns-scripts_no-ip_com=y CONFIG_PACKAGE_luci-app-eqos=y # CONFIG_PACKAGE_luci-app-jd-dailybonus is not set -# CONFIG_PACKAGE_luci-app-openclash is not set # CONFIG_PACKAGE_luci-app-rclone is not set # CONFIG_PACKAGE_luci-app-rclone_INCLUDE_fuse-utils is not set # CONFIG_PACKAGE_luci-app-rclone_INCLUDE_rclone-ng is not set # CONFIG_PACKAGE_luci-app-rclone_INCLUDE_rclone-webui is not set +CONFIG_PACKAGE_luci-app-onliner=y CONFIG_PACKAGE_luci-app-ssr-plus=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Xray=y +CONFIG_PACKAGE_luci-app-smartdns=y +CONFIG_PACKAGE_luci-app-serverchan=y +CONFIG_PACKAGE_luci-app-socat=y +CONFIG_SOCAT_SSL=y +CONFIG_PACKAGE_ppp-mod-pppol2tp=y +CONFIG_PACKAGE_ppp-mod-pptp=y +CONFIG_PACKAGE_wget-ssl=y CONFIG_PACKAGE_xray-geodata=y -CONFIG_PACKAGE_wget-ssl=y \ No newline at end of file +CONFIG_PACKAGE_xz=y +CONFIG_PACKAGE_xz-utils=y \ No newline at end of file diff --git a/Configs/asus_rt-acrh17 b/Configs/asus_rt-acrh17 index ae34ff5..fad4ea8 100644 --- a/Configs/asus_rt-acrh17 +++ b/Configs/asus_rt-acrh17 @@ -1,4 +1,2 @@ CONFIG_TARGET_ipq40xx=y CONFIG_TARGET_ipq40xx_DEVICE_asus_rt-acrh17=y - -## DO NOT MERGE \ No newline at end of file diff --git a/Configs/d-team_newifi-d2 b/Configs/d-team_newifi-d2 index 6b88c0e..4e0e2a9 100644 --- a/Configs/d-team_newifi-d2 +++ b/Configs/d-team_newifi-d2 @@ -2,9 +2,7 @@ CONFIG_TARGET_ramips=y CONFIG_TARGET_ramips_mt7621=y CONFIG_TARGET_ramips_mt7621_DEVICE_d-team_newifi-d2=y -CONFIG_BUILD_PATENTED=y - -# IPv6 相关 +# IPv6 支持 CONFIG_IPV6=y CONFIG_KERNEL_IPV6=y CONFIG_PACKAGE_ipv6helper=y @@ -12,9 +10,6 @@ CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_6rd=y CONFIG_PACKAGE_6to4=y -# 加密 -CONFIG_PACKAGE_luci-ssl-openssl=y - # Wireless 驱动程序(开源) CONFIG_PACKAGE_kmod-mt76=y @@ -48,18 +43,6 @@ CONFIG_PACKAGE_autosamba=y CONFIG_PACKAGE_luci-app-samba=y CONFIG_PACKAGE_luci-app-vsftpd=y -# 主题包以及相关设置 -CONFIG_PACKAGE_luci-theme-argon=y -CONFIG_PACKAGE_luci-app-argon-config=y - -# DDNS 相关 -CONFIG_PACKAGE_luci-app-ddns=y -CONFIG_PACKAGE_ddns-scripts_aliyun=y -CONFIG_PACKAGE_ddns-scripts_dnspod=y -CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y -CONFIG_PACKAGE_ddns-scripts_freedns_42_pl=y -CONFIG_PACKAGE_ddns-scripts_no-ip_com=y - ## 下载管理工具 CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_curl=y @@ -71,12 +54,7 @@ CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-mwan3=y CONFIG_PACKAGE_luci-app-mwan3helper=y CONFIG_PACKAGE_luci-app-nlbwmon=y -CONFIG_PACKAGE_luci-app-onliner=y CONFIG_PACKAGE_luci-app-sqm=y -CONFIG_PACKAGE_luci-app-smartdns=y -CONFIG_PACKAGE_luci-app-serverchan=y -CONFIG_PACKAGE_luci-app-socat=y -CONFIG_SOCAT_SSL=y CONFIG_PACKAGE_luci-app-syncdial=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-uhttpd=y @@ -87,13 +65,8 @@ CONFIG_PACKAGE_luci-app-webadmin=y CONFIG_PACKAGE_luci-app-wol=y CONFIG_PACKAGE_luci-app-wireguard=y CONFIG_PACKAGE_luci-app-zerotier=y +CONFIG_PACKAGE_luci-ssl-openssl=y # Other Appliciations -CONFIG_PACKAGE_ppp-mod-pppol2tp=y -CONFIG_PACKAGE_ppp-mod-pptp=y CONFIG_PACKAGE_wpad=y -CONFIG_PACKAGE_xz=y -CONFIG_PACKAGE_xz-utils=y - -## 网络性能 CONFIG_PACKAGE_iperf3=y diff --git a/Configs/x86_64 b/Configs/x86_64 index 8fbd27e..0ffcbb8 100644 --- a/Configs/x86_64 +++ b/Configs/x86_64 @@ -25,7 +25,6 @@ CONFIG_PACKAGE_kmod-usb3=y # CONFIG_PACKAGE_luci-app-adbyby-plus is not set # CONFIG_PACKAGE_luci-app-accesscontrol is not set -CONFIG_PACKAGE_luci-app-argon-config=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-arpbind=y CONFIG_PACKAGE_luci-app-baidupcs-web=y @@ -36,6 +35,10 @@ CONFIG_PACKAGE_luci-app-diskman_INCLUDE_kmod_md_raid456=y CONFIG_PACKAGE_luci-app-diskman_INCLUDE_lsblk=y CONFIG_PACKAGE_luci-app-diskman_INCLUDE_mdadm=y CONFIG_PACKAGE_luci-app-docker=y +CONFIG_DOCKER_CGROUP_OPTIONS=y +CONFIG_DOCKER_NET_MACVLAN=y +CONFIG_DOCKER_NET_TFTP=y +CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_luci-app-flowoffload=y CONFIG_PACKAGE_luci-app-hd-idle=y # CONFIG_PACKAGE_luci-app-ipsec-vpnd is not set @@ -43,19 +46,14 @@ CONFIG_PACKAGE_luci-app-hd-idle=y # CONFIG_PACKAGE_luci-app-mwan3 is not set CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-nfs=y -CONFIG_PACKAGE_luci-app-onliner=y CONFIG_PACKAGE_luci-app-ssr-plus=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Libev_Client=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Libev_Server=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Libev_Client=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Libev_Server=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Simple_Obfs=y -CONFIG_PACKAGE_luci-app-serverchan=y # CONFIG_PACKAGE_luci-app-sfe is not set -CONFIG_PACKAGE_luci-app-smartdns=y CONFIG_PACKAGE_luci-app-samba=y -CONFIG_PACKAGE_luci-app-socat=y -CONFIG_SOCAT_SSL=y CONFIG_PACKAGE_luci-app-sqm=y CONFIG_PACKAGE_luci-app-shutdown=y CONFIG_PACKAGE_luci-app-passwall=y @@ -73,9 +71,7 @@ CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-wrtbwmon=y CONFIG_PACKAGE_luci-app-webadmin=y CONFIG_PACKAGE_luci-app-zerotier=y - CONFIG_PACKAGE_luci-ssl-openssl=y -CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_6in4=y CONFIG_PACKAGE_6rd=y @@ -86,18 +82,10 @@ CONFIG_PACKAGE_curl=y CONFIG_PACKAGE_cfdisk=y CONFIG_PACKAGE_cifsmount=y CONFIG_PACKAGE_docker=y -CONFIG_DOCKER_CGROUP_OPTIONS=y -CONFIG_DOCKER_NET_MACVLAN=y -CONFIG_DOCKER_NET_TFTP=y -CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_docker-compose=y CONFIG_PACKAGE_dnsmasq-full=y CONFIG_PACKAGE_dnsmasq_full_dhcp=y CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y -CONFIG_PACKAGE_ddns-scripts_aliyun=y -CONFIG_PACKAGE_ddns-scripts_dnspod=y -CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y -CONFIG_PACKAGE_ddns-scripts_no-ip_com=y CONFIG_PACKAGE_e2fsprogs=y CONFIG_PACKAGE_exfat-mkfs=y CONFIG_PACKAGE_gdisk=y @@ -111,13 +99,9 @@ CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_libudev-fbsd=y CONFIG_PACKAGE_open-vm-tools=y CONFIG_PACKAGE_pciutils=y -CONFIG_PACKAGE_ppp-mod-pptp=y -CONFIG_PACKAGE_ppp-mod-pppol2tp=y CONFIG_PACKAGE_smartmontools=y CONFIG_PACKAGE_screen=y CONFIG_PACKAGE_tcpping=y CONFIG_PACKAGE_usbutils=y CONFIG_PACKAGE_usb-modeswitch=y CONFIG_PACKAGE_xl2tpd=y -CONFIG_PACKAGE_xz=y -CONFIG_PACKAGE_xz-utils=y diff --git a/Configs/xiaoyu_xy-c5 b/Configs/xiaoyu_xy-c5 index 054ae73..ae3a1f6 100644 --- a/Configs/xiaoyu_xy-c5 +++ b/Configs/xiaoyu_xy-c5 @@ -2,9 +2,7 @@ CONFIG_TARGET_ramips=y CONFIG_TARGET_ramips_mt7621=y CONFIG_TARGET_ramips_mt7621_DEVICE_xiaoyu_xy-c5=y -CONFIG_BUILD_PATENTED=y - -# IPv6 相关 +# IPv6 支持 CONFIG_IPV6=y CONFIG_KERNEL_IPV6=y CONFIG_PACKAGE_ipv6helper=y @@ -12,9 +10,6 @@ CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_6rd=y CONFIG_PACKAGE_6to4=y -# 加密 -CONFIG_PACKAGE_luci-ssl-openssl=y - # USB 相关 CONFIG_PACKAGE_automount=y CONFIG_PACKAGE_e2fsprogs=y @@ -38,18 +33,6 @@ CONFIG_PACKAGE_autosamba=y CONFIG_PACKAGE_luci-app-samba=y CONFIG_PACKAGE_luci-app-vsftpd=y -# 主题包以及相关设置 -CONFIG_PACKAGE_luci-theme-argon=y -CONFIG_PACKAGE_luci-app-argon-config=y - -# DDNS 相关 -CONFIG_PACKAGE_luci-app-ddns=y -CONFIG_PACKAGE_ddns-scripts_aliyun=y -CONFIG_PACKAGE_ddns-scripts_dnspod=y -CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y -CONFIG_PACKAGE_ddns-scripts_freedns_42_pl=y -CONFIG_PACKAGE_ddns-scripts_no-ip_com=y - ## 下载管理工具 CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_curl=y @@ -61,12 +44,7 @@ CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-mwan3=y CONFIG_PACKAGE_luci-app-mwan3helper=y CONFIG_PACKAGE_luci-app-nlbwmon=y -CONFIG_PACKAGE_luci-app-onliner=y CONFIG_PACKAGE_luci-app-sqm=y -CONFIG_PACKAGE_luci-app-smartdns=y -CONFIG_PACKAGE_luci-app-serverchan=y -CONFIG_PACKAGE_luci-app-socat=y -CONFIG_SOCAT_SSL=y CONFIG_PACKAGE_luci-app-syncdial=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-uhttpd=y @@ -77,12 +55,7 @@ CONFIG_PACKAGE_luci-app-webadmin=y CONFIG_PACKAGE_luci-app-wol=y CONFIG_PACKAGE_luci-app-wireguard=y CONFIG_PACKAGE_luci-app-zerotier=y - -# Other Appliciations -CONFIG_PACKAGE_ppp-mod-pppol2tp=y -CONFIG_PACKAGE_ppp-mod-pptp=y -CONFIG_PACKAGE_xz=y -CONFIG_PACKAGE_xz-utils=y +CONFIG_PACKAGE_luci-ssl-openssl=y ## 网络性能 CONFIG_PACKAGE_iperf3=y