From 542ea6887e6918423cf4311630fe08986021e3eb Mon Sep 17 00:00:00 2001 From: tszm4555 <455581965@qq.com> Date: Thu, 9 Jun 2022 13:12:55 +0800 Subject: [PATCH 1/8] Update K2P.config --- trunk/configs/templates/K2P.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/configs/templates/K2P.config b/trunk/configs/templates/K2P.config index a0dccae151..01fa40d48e 100644 --- a/trunk/configs/templates/K2P.config +++ b/trunk/configs/templates/K2P.config @@ -228,7 +228,7 @@ CONFIG_FIRMWARE_INCLUDE_SRELAY=n CONFIG_FIRMWARE_INCLUDE_MENTOHUST=n -CONFIG_FIRMWARE_INCLUDE_FRPC=n +CONFIG_FIRMWARE_INCLUDE_FRPC=y CONFIG_FIRMWARE_INCLUDE_FRPS=n From 2677c2ff0d465b781c761dc3d1db00d68df09a98 Mon Sep 17 00:00:00 2001 From: tszm4555 <455581965@qq.com> Date: Thu, 9 Jun 2022 13:14:37 +0800 Subject: [PATCH 2/8] Update build_firmware_modify --- trunk/build_firmware_modify | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/trunk/build_firmware_modify b/trunk/build_firmware_modify index 3af4e6ae50..f94364ff68 100755 --- a/trunk/build_firmware_modify +++ b/trunk/build_firmware_modify @@ -23,9 +23,9 @@ sed -i 's/CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y/CONFIG_FIRMWARE_INCLUDE_SHADOWSO ##此插件选项只在本地编译的时候才会生效 ##科学上网## echo "CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y" >> .config #科学上网插件，选择n后全部有关插件都不集成 -echo "CONFIG_FIRMWARE_INCLUDE_XRAY=y" >> .config #集成xray执行文件 ~4.5M +echo "CONFIG_FIRMWARE_INCLUDE_XRAY=n" >> .config #集成xray执行文件 ~4.5M echo "CONFIG_FIRMWARE_INCLUDE_V2RAY=n" >> .config #集成v2ray执行文件 -echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=y" >> .config #集成trojan执行文件 ~1.2M +echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=n" >> .config #集成trojan执行文件 ~1.2M echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=y" >> .config #simple-obfs混淆插件 ##科学上网## @@ -33,20 +33,20 @@ echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=y" >> .config #simple-obfs混淆插件 echo "CONFIG_FIRMWARE_INCLUDE_ADBYBY=y" >> .config #adbyby plus+ ##DNS服务## -echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNS=n" >> .config #smartdns +echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNS=y" >> .config #smartdns echo "CONFIG_FIRMWARE_INCLUDE_ADGUARDHOME=n" >> .config #adg DNS去AD ##内网穿透服务## echo "CONFIG_FIRMWARE_INCLUDE_ZEROTIER=y" >> .config #zerotier ~1.3M -echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=y" >> .config #aliddns -echo "CONFIG_FIRMWARE_INCLUDE_DDNSTO=y" >> .config #ddnsto ~0.5M +echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=n" >> .config #aliddns +echo "CONFIG_FIRMWARE_INCLUDE_DDNSTO=n" >> .config #ddnsto ~0.5M ##内网穿透服务## echo "CONFIG_FIRMWARE_INCLUDE_ALDRIVER=n" >> .config #ALDRIVER ~3m echo "CONFIG_FIRMWARE_INCLUDE_MENTOHUST=n" >> .config #mentohust -echo "CONFIG_FIRMWARE_INCLUDE_SQM=y" >> .config #SQM +echo "CONFIG_FIRMWARE_INCLUDE_SQM=n" >> .config #SQM echo "CONFIG_FIRMWARE_INCLUDE_WIREGUARD=y" >>.config #wireguard 10k -echo "CONFIG_FIRMWARE_INCLUDE_FRPC=n" >> .config #frpc +echo "CONFIG_FIRMWARE_INCLUDE_FRPC=y" >> .config #frpc echo "CONFIG_FIRMWARE_INCLUDE_FRPS=n" >> .config #frps #CPU超频 echo "CONFIG_FIRMWARE_INCLUDE_OC=n" >> .config #CPU超频开关 From 8f86d8e30e7b31e940e18108d3711e92b554b795 Mon Sep 17 00:00:00 2001 From: tszm4555 <455581965@qq.com> Date: Thu, 9 Jun 2022 18:41:08 +0800 Subject: [PATCH 3/8] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d1c40c0e01..c328b240a9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -8,7 +8,7 @@ on: release: types: [published] -# A workflow run is made up of one or more jobs that can run sequentially or in parallel +## A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: build: name: build From c5eb5fb68f54ae41d565be64450720667b0f57f5 Mon Sep 17 00:00:00 2001 From: tszm4555 <455581965@qq.com> Date: Sat, 11 Jun 2022 11:59:15 +0800 Subject: [PATCH 4/8] Update build_firmware_modify --- trunk/build_firmware_modify | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/build_firmware_modify b/trunk/build_firmware_modify index f94364ff68..041698b612 100755 --- a/trunk/build_firmware_modify +++ b/trunk/build_firmware_modify @@ -30,7 +30,7 @@ echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=y" >> .config #simple-obfs混淆插件 ##科学上网## ##广告管理## -echo "CONFIG_FIRMWARE_INCLUDE_ADBYBY=y" >> .config #adbyby plus+ +echo "CONFIG_FIRMWARE_INCLUDE_ADBYBY=n" >> .config #adbyby plus+ ##DNS服务## echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNS=y" >> .config #smartdns @@ -39,7 +39,7 @@ echo "CONFIG_FIRMWARE_INCLUDE_ADGUARDHOME=n" >> .config #adg DNS去AD ##内网穿透服务## echo "CONFIG_FIRMWARE_INCLUDE_ZEROTIER=y" >> .config #zerotier ~1.3M -echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=n" >> .config #aliddns +echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=y" >> .config #aliddns echo "CONFIG_FIRMWARE_INCLUDE_DDNSTO=n" >> .config #ddnsto ~0.5M ##内网穿透服务## echo "CONFIG_FIRMWARE_INCLUDE_ALDRIVER=n" >> .config #ALDRIVER ~3m From 2f14d5cbce744b98d13385616134d25d9d878bf2 Mon Sep 17 00:00:00 2001 From: tszm4555 <455581965@qq.com> Date: Sat, 11 Jun 2022 19:03:14 +0800 Subject: [PATCH 5/8] Update build_firmware_modify --- trunk/build_firmware_modify | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/build_firmware_modify b/trunk/build_firmware_modify index 041698b612..7abb6d066b 100755 --- a/trunk/build_firmware_modify +++ b/trunk/build_firmware_modify @@ -24,8 +24,8 @@ sed -i 's/CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y/CONFIG_FIRMWARE_INCLUDE_SHADOWSO ##科学上网## echo "CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y" >> .config #科学上网插件，选择n后全部有关插件都不集成 echo "CONFIG_FIRMWARE_INCLUDE_XRAY=n" >> .config #集成xray执行文件 ~4.5M -echo "CONFIG_FIRMWARE_INCLUDE_V2RAY=n" >> .config #集成v2ray执行文件 -echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=n" >> .config #集成trojan执行文件 ~1.2M +echo "CONFIG_FIRMWARE_INCLUDE_V2RAY=y" >> .config #集成v2ray执行文件 +echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=y" >> .config #集成trojan执行文件 ~1.2M echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=y" >> .config #simple-obfs混淆插件 ##科学上网## From 7b54e574982578ba68cabadbcb22a538deb55f58 Mon Sep 17 00:00:00 2001 From: tszm4555 <455581965@qq.com> Date: Sat, 11 Jun 2022 21:35:23 +0800 Subject: [PATCH 6/8] Update build_firmware_modify --- trunk/build_firmware_modify | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/build_firmware_modify b/trunk/build_firmware_modify index 7abb6d066b..10c484f165 100755 --- a/trunk/build_firmware_modify +++ b/trunk/build_firmware_modify @@ -25,8 +25,8 @@ sed -i 's/CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y/CONFIG_FIRMWARE_INCLUDE_SHADOWSO echo "CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y" >> .config #科学上网插件，选择n后全部有关插件都不集成 echo "CONFIG_FIRMWARE_INCLUDE_XRAY=n" >> .config #集成xray执行文件 ~4.5M echo "CONFIG_FIRMWARE_INCLUDE_V2RAY=y" >> .config #集成v2ray执行文件 -echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=y" >> .config #集成trojan执行文件 ~1.2M -echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=y" >> .config #simple-obfs混淆插件 +echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=n" >> .config #集成trojan执行文件 ~1.2M +echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=n" >> .config #simple-obfs混淆插件 ##科学上网## ##广告管理## From 6e8ce00f4f64ef5c18f4dbd0ac5e21579f81677a Mon Sep 17 00:00:00 2001 From: tszm4555 <455581965@qq.com> Date: Sun, 12 Jun 2022 00:24:50 +0800 Subject: [PATCH 7/8] Update build_firmware_modify --- trunk/build_firmware_modify | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/build_firmware_modify b/trunk/build_firmware_modify index 10c484f165..27a98e7640 100755 --- a/trunk/build_firmware_modify +++ b/trunk/build_firmware_modify @@ -24,9 +24,9 @@ sed -i 's/CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y/CONFIG_FIRMWARE_INCLUDE_SHADOWSO ##科学上网## echo "CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y" >> .config #科学上网插件，选择n后全部有关插件都不集成 echo "CONFIG_FIRMWARE_INCLUDE_XRAY=n" >> .config #集成xray执行文件 ~4.5M -echo "CONFIG_FIRMWARE_INCLUDE_V2RAY=y" >> .config #集成v2ray执行文件 -echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=n" >> .config #集成trojan执行文件 ~1.2M -echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=n" >> .config #simple-obfs混淆插件 +echo "CONFIG_FIRMWARE_INCLUDE_V2RAY=n" >> .config #集成v2ray执行文件 +echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=y" >> .config #集成trojan执行文件 ~1.2M +echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=y" >> .config #simple-obfs混淆插件 ##科学上网## ##广告管理## From fdf5f7917d0f933151d51a573403bf1cc110686c Mon Sep 17 00:00:00 2001 From: tszm4555 <455581965@qq.com> Date: Sun, 26 Jun 2022 17:31:54 +0800 Subject: [PATCH 8/8] Update B70.config B70 --- trunk/configs/templates/B70.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/configs/templates/B70.config b/trunk/configs/templates/B70.config index 148cfc605b..7aa25b327e 100644 --- a/trunk/configs/templates/B70.config +++ b/trunk/configs/templates/B70.config @@ -97,7 +97,7 @@ CONFIG_FIRMWARE_INCLUDE_LANG_CN=y #CONFIG_FIRMWARE_INCLUDE_LANG_UK=y ### Include NTFS-3G FUSE driver. ~0.4MB -CONFIG_FIRMWARE_INCLUDE_NTFS_3G=n +CONFIG_FIRMWARE_INCLUDE_NTFS_3G=y ### Include LPR printer daemon. ~0.12MB CONFIG_FIRMWARE_INCLUDE_LPRD=y