yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
John Doe
2021-10-12 01:11:17 +08:00
parent 49495b2544
commit 247def645c
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common.seed
View File

@@ -66,7 +66,6 @@ CONFIG_PACKAGE_ddns-scripts-dnspod=y
CONFIG_PACKAGE_ddns-scripts-dnspod-com=y CONFIG_PACKAGE_ddns-scripts-dnspod-com=y
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_fdisk=y
CONFIG_PACKAGE_frpc=y
CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_htop=y
CONFIG_PACKAGE_iperf3=y CONFIG_PACKAGE_iperf3=y
CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-conntrack-extra=y

3
scripts/merge_packages.sh
View File

@@ -24,7 +24,8 @@ function merge_feed(){
merge_feed nas "https://github.com/linkease/nas-packages;master" merge_feed nas "https://github.com/linkease/nas-packages;master"
merge_feed nas_luci "https://github.com/linkease/nas-packages-luci;main" 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/project-lede/luci-app-godproxy
merge_package https://github.com/Beginner-Go/luci-app-tencentddns merge_package https://github.com/Beginner-Go/luci-app-tencentddns
merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-services-wolplus merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-services-wolplus

1
scripts/patches.sh
View File

@@ -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/$/ +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/$/ +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 '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` sed -i '/skip\=/ a skip=`mount | grep -q /dev/$device; echo $?`' `find package/ -follow -type f -path */automount/files/15-automount`