diff --git a/common.seed b/common.seed index d5c1fe6..c4a7fbc 100644 --- a/common.seed +++ b/common.seed @@ -66,7 +66,6 @@ CONFIG_PACKAGE_ddns-scripts-dnspod=y CONFIG_PACKAGE_ddns-scripts-dnspod-com=y CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_fdisk=y -CONFIG_PACKAGE_frpc=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_iperf3=y CONFIG_PACKAGE_iptables-mod-conntrack-extra=y diff --git a/scripts/merge_packages.sh b/scripts/merge_packages.sh index ef11eb6..364ed0b 100644 --- a/scripts/merge_packages.sh +++ b/scripts/merge_packages.sh @@ -24,7 +24,8 @@ function merge_feed(){ merge_feed nas "https://github.com/linkease/nas-packages;master" merge_feed nas_luci "https://github.com/linkease/nas-packages-luci;main" -merge_feed mosdns "https://github.com/klever1988/openwrt-mos;master" +merge_package https://github.com/klever1988/openwrt-mos/trunk/luci-app-mosdns +merge_package https://github.com/klever1988/openwrt-mos/trunk/mosdns merge_package https://github.com/project-lede/luci-app-godproxy merge_package https://github.com/Beginner-Go/luci-app-tencentddns merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-services-wolplus diff --git a/scripts/patches.sh b/scripts/patches.sh index 83e60cc..4941a6a 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -12,6 +12,7 @@ sed -i 's/=1/=0/g' package/kernel/linux/files/sysctl-br-netfilter.conf sed -i '/DEPENDS/ s/$/ +libcap-bin/' `find package/ -follow -type f -path '*/luci-app-openclash/Makefile'` sed -i '/DEPENDS+/ s/$/ +wsdd2/' `find package/ -follow -type f -path '*/ksmbd-tools/Makefile'` +sed -i '/DEPENDS/ s/$/ +frpc/' `find package/ -follow -type f -path '*/luci-app-frpc/Makefile'` sed -i 's/ +ntfs-3g/ +ntfs3-mount/' `find package/ -follow -type f -path '*/automount/Makefile'` sed -i '/skip\=/ a skip=`mount | grep -q /dev/$device; echo $?`' `find package/ -follow -type f -path */automount/files/15-automount`