diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index dda8b23..64b46a8 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -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 diff --git a/scripts/patches.sh b/scripts/patches.sh index e90f9f7..c74e026 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -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'`