diff --git a/6.1/target/linux/generic/config-6.1 b/6.1/target/linux/generic/config-6.1 index 1889a9cd..07882a81 100644 --- a/6.1/target/linux/generic/config-6.1 +++ b/6.1/target/linux/generic/config-6.1 @@ -2260,6 +2260,7 @@ CONFIG_FSNOTIFY=y # CONFIG_FUJITSU_ES is not set # CONFIG_FUJITSU_LAPTOP is not set # CONFIG_FUJITSU_TABLET is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FUNCTION_TRACER is not set # CONFIG_FUN_ETH is not set # CONFIG_FUSE_FS is not set diff --git a/6.1/target/linux/x86/64/config-6.1 b/6.1/target/linux/x86/64/config-6.1 index 11212941..27aae1ed 100644 --- a/6.1/target/linux/x86/64/config-6.1 +++ b/6.1/target/linux/x86/64/config-6.1 @@ -292,6 +292,7 @@ CONFIG_LEDS_GPIO=y CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_LEGACY_VSYSCALL_XONLY is not set CONFIG_LIBNVDIMM=y +CONFIG_HAVE_LIVEPATCH=y CONFIG_LIVEPATCH=y CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_LPC_ICH=y diff --git a/build.sh b/build.sh index 01c51ad4..a76b1d64 100755 --- a/build.sh +++ b/build.sh @@ -148,7 +148,8 @@ rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/files" "$OMR_TARGET/${OMR_KERNEL}/sourc #rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-mediatek" #rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/arm-trusted-firmware-mediatek" [ "${OMR_KERNEL}" = "5.4" ] && rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/tools/firmware-utils" -rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-rockchip" +echo "rm -rf $OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-rockchip" +rm -rf "${OMR_TARGET}/${OMR_KERNEL}/source/package/boot/uboot-rockchip" if [ "$OMR_TARGET" != "rutx" ]; then # There is many customization to support rutx and this seems to break other ipq40xx, so dirty workaround for now [ -d "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx" ] && mv -f "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx" "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx.old" @@ -665,6 +666,7 @@ if [ "$OMR_KERNEL" = "6.1" ]; then rm -f package/kernel/rtl8812au-ct/patches/004-* rm -f package/kernel/rtl8812au-ct/patches/100-api_update.patch rm -f target/linux/bcm27xx/modules/sound.mk + rm -f package/libs/elfutils/patches/101-no-fts.patch # echo "CONFIG_DEVEL=y" >> ".config" # echo "CONFIG_NEED_TOOLCHAIN=y" >> ".config" # echo "CONFIG_TOOLCHAINOPTS=y" >> ".config"