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

make-image: fix the package-fetching rule

Browse Source
This commit is contained in:
John Doe
2021-08-29 05:36:43 +08:00
parent 034c099cf5
commit ea08f895fa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,8 +246,8 @@ jobs:
sed -i '/luci-lib-base/d;/luci-lib-ipkg/d' include/target.mk
sed -i 's/luci-app-[^ ]*//g' include/target.mk $(find target/ -name Makefile)
sed -i 's/$(OPKG) install $(BUILD_PACKAGES)/$(OPKG) install --force-overwrite $(BUILD_PACKAGES)/' Makefile
PACKAGES=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}* 2>/dev/null' | grep -v luci-app | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
LUCI=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}* 2>/dev/null' | grep -v docker | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
PACKAGES=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}_* 2>/dev/null' | grep -v luci-app | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
LUCI=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}_* 2>/dev/null' | grep -v docker | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
LP=$(cd packages; echo $LUCI | sed 's/-app-/-i18n-/g;s/ /\n/g' | xargs -n1 -i sh -c 'ls {}-zh-cn* 2>/dev/null' | sed 's/zh-.*.ipk/zh-cn/' | xargs echo)
make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files"
@@ -263,7 +263,7 @@ jobs:
fi
cd $GITHUB_WORKSPACE/ib
rm -rf bin/
LUCI=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}* 2>/dev/null' | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
LUCI=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}_* 2>/dev/null' | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
LP=$(cd packages; echo $LUCI | sed 's/-app-/-i18n-/g;s/ /\n/g' | xargs -n1 -i sh -c 'ls {}-zh-cn* 2>/dev/null' | sed 's/zh-.*.ipk/zh-cn/' | xargs echo)
make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files"
mv $(ls -1 ./bin/targets/*/*/*img.gz | head -1) $GITHUB_WORKSPACE/release/$DEVICE-with-docker.img.gz