更新配置

Siriling · Mar 16, 2024 · b62a7b9 · b62a7b9
1 parent 4e23fe6
commit b62a7b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/scripts/full.sh b/scripts/full.sh
@@ -8,6 +8,9 @@
 #=================================================
 # Clone community packages to package/community
 
+# 删除冲突插件
+rm -rf feeds/luci/applications/luci-app-mosdns && rm -rf feeds/packages/net/{alist,adguardhome,smartdns}
+
 # 添加第三方应用
 mkdir kenzok8
 pushd kenzok8
@@ -17,6 +20,7 @@ popd
 mkdir kenzok8-small
 pushd kenzok8-small
 git clone --depth=1 https://github.com/kenzok8/small-package .
+rm -rf {base-files,dnsmasq,firewall*,fullconenat,libnftnl,nftables,ppp,opkg,ucl,upx,vsftpd-alt,miniupnpd-iptables,wireless-regdb}
 popd
 
 mkdir kenzok8-outside
@@ -268,5 +272,5 @@ cp -f $GITHUB_WORKSPACE/999-fuck-rockchip-pcie.patch target/linux/rockchip/patch
 # 编译新版Sing-box和hysteria，需golang版本1.20或者以上版本
 pushd feeds/packages/lang
 rm -rf golang
-git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
+git clone https://github.com/kenzok8/golang feeds/packages/lang/golang
 popd
diff --git a/scripts/simplify.sh b/scripts/simplify.sh
@@ -8,6 +8,9 @@
 #=================================================
 # Clone community packages to package/community
 
+# 删除冲突插件
+rm -rf feeds/luci/applications/luci-app-mosdns && rm -rf feeds/packages/net/{alist,adguardhome,smartdns}
+
 # 添加第三方应用
 mkdir kenzok8
 pushd kenzok8
@@ -17,6 +20,7 @@ popd
 mkdir kenzok8-small
 pushd kenzok8-small
 git clone --depth=1 https://github.com/kenzok8/small-package .
+rm -rf {base-files,dnsmasq,firewall*,fullconenat,libnftnl,nftables,ppp,opkg,ucl,upx,vsftpd-alt,miniupnpd-iptables,wireless-regdb}
 popd
 
 mkdir kenzok8-outside
@@ -253,5 +257,5 @@ cp -f $GITHUB_WORKSPACE/999-fuck-rockchip-pcie.patch target/linux/rockchip/patch
 # 编译新版Sing-box和hysteria，需golang版本1.20或者以上版本
 pushd feeds/packages/lang
 rm -rf golang
-git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
-popd
+git clone https://github.com/kenzok8/golang feeds/packages/lang/golang
+popd