mirrors
/
nanopi-openwrt
mirror of https://github.com/stupidloud/nanopi-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix x86

pull/853/head
John Doe 2021-09-13 23:38:52 +08:00
parent 8fed95e9f4
commit 9b9bf00933
No known key found for this signature in database
GPG Key ID: 30F190E0C359CB4F
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,6 @@ jobs:
mv *imagebuilder* ib && cd ib
. $GITHUB_WORKSPACE/scripts/merge_files.sh
mkdir -p files/local_feed && sudo mount --bind packages files/local_feed
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
ls packages/*.ipk | xargs -n1 basename > package.files
@ -252,7 +251,6 @@ jobs:
mv *imagebuilder* ib && cd ib
. $GITHUB_WORKSPACE/scripts/merge_files.sh
sed -i '/local/d;s/#//' files/etc/opkg/distfeeds.conf
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
ls packages/*.ipk | xargs -n1 basename > package.files

1
scripts/patches.sh
View File

@ -35,6 +35,7 @@ if [ $DEVICE != 'r1s' ]; then
# remove non-exist package from x86 profile
sed -i 's/kmod-i40evf//' target/linux/x86/Makefile
sed -i 's/KERNEL_PATCHVER:=5.10/KERNEL_PATCHVER:=5.4/' target/linux/x86/Makefile
# enable r2s oled plugin by default
sed -i "s/enable '0'/enable '1'/" `find package/ -follow -type f -path '*/luci-app-oled/root/etc/config/oled'`