From 834b6b73a3e87563d8d71f3943b537eeafbbe46d Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 16 Aug 2021 23:08:49 +0800 Subject: [PATCH] Package: replace ntfs-3g with ntfs3-mount, add fstrim --- extra_packages.seed | 1 + merge_packages.sh | 8 +++++--- patches.sh | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/extra_packages.seed b/extra_packages.seed index 5b0fb1b..74c61c5 100644 --- a/extra_packages.seed +++ b/extra_packages.seed @@ -1,3 +1,4 @@ +CONFIG_PACKAGE_fstrim=m CONFIG_PACKAGE_igmpproxy=m CONFIG_PACKAGE_node-npm=m CONFIG_PACKAGE_smartmontools-drivedb=m diff --git a/merge_packages.sh b/merge_packages.sh index a0c719a..b412a45 100644 --- a/merge_packages.sh +++ b/merge_packages.sh @@ -1,8 +1,8 @@ function merge_package(){ pn=`echo $1 | rev | cut -d'/' -f 1 | rev` - find package/ \( -type l -o -type d \) -name $pn | xargs -r rm -r + find package/ feeds/ \( -type l -o -type d \) -name $pn | xargs -r rm -r if [ ! -z "$2" ]; then - find package/ \( -type l -o -type d \) -name $2 | xargs -r rm -r + find package/ feeds/ \( -type l -o -type d \) -name $2 | xargs -r rm -r fi if [[ $1 == *'/trunk/'* ]]; then @@ -28,4 +28,6 @@ merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-c merge_package https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools merge_package https://github.com/Beginner-Go/luci-app-tencentddns -merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-services-wolplus \ No newline at end of file +merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-services-wolplus +merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/ntfs3-mount +merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/ntfs3 \ No newline at end of file diff --git a/patches.sh b/patches.sh index ee5b44c..7a427a1 100644 --- a/patches.sh +++ b/patches.sh @@ -10,6 +10,7 @@ sed -i 's/=1/=0/g' package/kernel/linux/files/sysctl-br-netfilter.conf sed -i '/DEPENDS/ s/$/ +libcap-bin/' `find . -type f -path '*/luci-app-openclash/Makefile'` sed -i '/DEPENDS+/ s/$/ +wsdd2/' `find . -type f -path '*/ksmbd-tools/Makefile'` +sed -i 's/ +ntfs-3g/ +ntfs3-mount/' `find . -type f -path '*/automount/Makefile'` if [ $DEVICE = 'r2s' ]; then sed -i "s/enable '0'/enable '1'/" `find feeds/ -type f -name oled | grep config`