From d69147a95a2bf0935e4a602799330d9017fdab1f Mon Sep 17 00:00:00 2001
From: John Doe <klever1988@protonmail.com>
Date: Thu, 25 Mar 2021 08:50:28 +0800
Subject: [PATCH] Revert "build: inject luci feed"

This reverts commit 4ff863e766e068d3282e196dc10a81b60a3eb086.
---
 .github/workflows/lo-test.yml | 9 ++++-----
 files/etc/opkg/distfeeds.conf | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml
index d32e160..9735e1f 100644
--- a/.github/workflows/lo-test.yml
+++ b/.github/workflows/lo-test.yml
@@ -83,6 +83,8 @@ 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: |
@@ -109,7 +111,6 @@ jobs:
           cat $GITHUB_WORKSPACE/extra_packages.seed >> .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_{}=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))
@@ -121,15 +122,13 @@ 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 files/local_feed/luci
+          mkdir -p files/local_feed/core files/local_feed/base
           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 files/local_feed/luci
+          sudo umount files/local_feed/core files/local_feed/base
           rm files/etc/opkg/distfeeds.conf
 
           echo "======================="
diff --git a/files/etc/opkg/distfeeds.conf b/files/etc/opkg/distfeeds.conf
index 4571364..824f376 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