From a3dd4aea2c70d6c86e56143dfb9d63a44d3bef11 Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 2 Apr 2021 00:37:06 +0800 Subject: [PATCH] tmp: remove the base --- .github/workflows/lo-test.yml | 5 +++-- merge_packages.sh | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index f156349..9d5bff9 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -64,12 +64,12 @@ jobs: pushd feeds/routing; git restore .; popd pushd feeds/telephony; git restore .; popd fi - [ -d package/base ] && mv package/base ~/ + rm -rf package/base luci package/luci-app-oled ./scripts/feeds update -a ./scripts/feeds install -a - [ -d ~/base ] && mv ~/base package/ . $GITHUB_WORKSPACE/patches.sh . $GITHUB_WORKSPACE/merge_packages.sh + cd svn export https://github.com/openwrt/luci/branches/openwrt-18.06 luci pushd luci ls -d */ | xargs -n1 -i diff -q {} ../lede/feeds/luci/{} | grep Only | grep lede | grep -E applications\|themes | awk '{print $4}' | xargs -n1 -i echo CONFIG_PACKAGE_{}=m >> ~/lede/more_luci.txt @@ -79,6 +79,7 @@ jobs: run: | cd ~/lede cat $GITHUB_WORKSPACE/$DEVICE.config.seed | sed 's/\(CONFIG_PACKAGE_luci-app-[^A-Z]*=\)y/\1m/' > .config + find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo CONFIG_PACKAGE_{}=m >> .config cat $GITHUB_WORKSPACE/extra_packages.seed >> .config cat more_luci.txt >> .config make defconfig && cat .config diff --git a/merge_packages.sh b/merge_packages.sh index e023f98..849ffe7 100644 --- a/merge_packages.sh +++ b/merge_packages.sh @@ -21,6 +21,5 @@ merge_package https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools if [ $DEVICE = 'r2s' ]; then - merge_package https://github.com/NateLol/luci-app-oled - sed -i "s/enable '0'/enable '1'/" package/luci-app-oled/root/etc/config/oled + sed -i "s/enable '0'/enable '1'/" `find feeds/ -type f -name oled | grep config` fi