From 723ab4e218624b704c8cc5b43c59c3102c144ceb Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 21 Oct 2021 19:01:41 +0800 Subject: [PATCH] Build: remove poison --- scripts/merge_packages.sh | 3 ++- scripts/patches.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/merge_packages.sh b/scripts/merge_packages.sh index c26a0e4..4617bb5 100644 --- a/scripts/merge_packages.sh +++ b/scripts/merge_packages.sh @@ -43,4 +43,5 @@ merge_package https://github.com/small-5/luci-app-adblock-plus merge_package https://github.com/zxlhhyccc/luci-app-v2raya merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/aliyundrive-webdav merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/luci-app-aliyundrive-webdav -drop_package luci-app-cd8021x \ No newline at end of file +drop_package luci-app-cd8021x +drop_package luci-app-cifs \ No newline at end of file diff --git a/scripts/patches.sh b/scripts/patches.sh index 2ffddd3..a47be6e 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -24,8 +24,8 @@ sed -i 's/5.0/1.0/' .ccache/ccache.conf || true if [ $BRANCH == 'master' ]; then - sed -i 's/5.10/5.4/' target/linux/rockchip/Makefile - git revert --no-commit -X theirs 91eed5d9fb74e6c740291362ba12e11a2222a9fd + #sed -i 's/5.10/5.4/' target/linux/rockchip/Makefile + #git revert --no-commit -X theirs 91eed5d9fb74e6c740291362ba12e11a2222a9fd # fix po path for snapshot find package/ -follow -type d -path '*/po/zh-cn' | xargs dirname | xargs -n1 -i sh -c "rm -f {}/zh_Hans; ln -sf zh-cn {}/zh_Hans"