yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "build: inject luci feed"

Browse Source 
This reverts commit 4ff863e766.
This commit is contained in:
John Doe
2021-03-25 08:50:28 +08:00
parent 6c4603dd25
commit d69147a95a
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/lo-test.yml vendored
View File

@@ -83,6 +83,8 @@ jobs:
run: | run: |
cd ~/lede cd ~/lede
cat $GITHUB_WORKSPACE/$DEVICE.config.seed | sed '/CONFIG_PACKAGE_luci-app-/d' > .config 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 - name: Build and deploy packages
run: | run: |
@@ -109,7 +111,6 @@ jobs:
cat $GITHUB_WORKSPACE/extra_packages.seed >> .config cat $GITHUB_WORKSPACE/extra_packages.seed >> .config
echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .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 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 make defconfig && cat .config
while true; do make download -j && break || true; done while true; do make download -j && break || true; done
make target/linux/compile -j$(($(nproc) + 1)) 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 cat $GITHUB_WORKSPACE/$DEVICE.config.seed | sed '/CONFIG_PACKAGE_luci-app-/d' > .config
echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .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 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 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/targets/*/*/packages/ files/local_feed/core
sudo mount --bind bin/packages/*/base/ files/local_feed/base 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 pushd bin/ && . ../files/etc/opkg/distfeeds.conf | tee ../files/etc/opkg/distfeeds.conf && popd
make -j$(($(nproc) + 1)) 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 rm files/etc/opkg/distfeeds.conf
echo "=======================" echo "======================="

2
files/etc/opkg/distfeeds.conf
View File

@@ -1,6 +1,6 @@
echo src/gz immortalwrt_core file:///local_feed/core echo src/gz immortalwrt_core file:///local_feed/core
echo src/gz immortalwrt_base file:///local_feed/base 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_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_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) echo src/gz immortalwrt_telephony https://mirrors.tencent.com/lede/releases/18.06.9/$(ls -d packages/*/telephony)