From 4ff863e766e068d3282e196dc10a81b60a3eb086 Mon Sep 17 00:00:00 2001 From: John Doe Date: Wed, 24 Mar 2021 17:58:34 +0800 Subject: [PATCH] build: inject luci feed --- .github/workflows/lo-test.yml | 11 ++++++----- files/etc/opkg/distfeeds.conf | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 9cd4415..b4b9c40 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -70,8 +70,6 @@ jobs: run: | cd ~/lede cat $GITHUB_WORKSPACE/$DEVICE.config.seed | sed '/CONFIG_PACKAGE_luci-app-/d' > .config - echo >> .config - find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo "# CONFIG_PACKAGE_{} is not set" >> .config - name: Build and deploy packages run: | @@ -96,7 +94,8 @@ jobs: sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .config - find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | sort | xargs -n1 -i echo CONFIG_PACKAGE_{}=y >> .config + find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo CONFIG_PACKAGE_{}=y >> .config + find feeds/luci/applications -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo CONFIG_PACKAGE_{}=y >> .config make defconfig && cat .config while true; do make download -j && break || true; done make target/linux/compile -j$(($(nproc) + 1)) @@ -108,13 +107,15 @@ jobs: cat $GITHUB_WORKSPACE/$DEVICE.config.seed | sed '/CONFIG_PACKAGE_luci-app-/d' > .config echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .config find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo "# CONFIG_PACKAGE_{} is not set" >> .config + find feeds/luci/applications -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo "# CONFIG_PACKAGE_{} is not set" >> .config make defconfig - mkdir -p files/local_feed/core files/local_feed/base + mkdir -p files/local_feed/core files/local_feed/base files/local_feed/luci sudo mount --bind bin/targets/*/*/packages/ files/local_feed/core sudo mount --bind bin/packages/*/base/ files/local_feed/base + sudo mount --bind bin/packages/*/luci/ files/local_feed/luci pushd bin/ && . ../files/etc/opkg/distfeeds.conf | tee ../files/etc/opkg/distfeeds.conf && popd make -j$(($(nproc) + 1)) - sudo umount files/local_feed/core files/local_feed/base + sudo umount files/local_feed/core files/local_feed/base files/local_feed/luci rm files/etc/opkg/distfeeds.conf echo "=======================" diff --git a/files/etc/opkg/distfeeds.conf b/files/etc/opkg/distfeeds.conf index 824f376..4571364 100644 --- a/files/etc/opkg/distfeeds.conf +++ b/files/etc/opkg/distfeeds.conf @@ -1,6 +1,6 @@ echo src/gz immortalwrt_core file:///local_feed/core echo src/gz immortalwrt_base file:///local_feed/base +echo src/gz immortalwrt_luci file:///local_feed/luci echo src/gz immortalwrt_packages https://mirrors.tencent.com/lede/snapshots/$(ls -d packages/*/packages) -echo src/gz immortalwrt_luci https://mirrors.tencent.com/lede/releases/18.06.9/$(ls -d packages/*/luci) echo src/gz immortalwrt_routing https://mirrors.tencent.com/lede/releases/18.06.9/$(ls -d packages/*/routing) echo src/gz immortalwrt_telephony https://mirrors.tencent.com/lede/releases/18.06.9/$(ls -d packages/*/telephony) \ No newline at end of file