From 1f42b720d05d8fff5cf471f60c38be957db5eee1 Mon Sep 17 00:00:00 2001 From: Vincent Li Date: Fri, 20 Sep 2024 17:56:38 +0000 Subject: [PATCH] kernel: upgrade to 6.10.11 upgrade kernel to recent stable release 6.10.11 1, scripts/kconfig/merge_config.sh does not work for 6.10.11 2, vmlinux BTF binary name changed in 6.10.11 3, remove rtl8812au for now since it has compiling error 4, remove 5.15 nfqueue patch since it does not apply cleanly also see [0] [0]: https://github.com/vincentmli/BPFire/issues/41 Signed-off-by: Vincent Li --- config/kernel/kernel.config.x86_64-ipfire | 12 ++++++++++++ lfs/linux | 11 +++-------- make.sh | 1 - 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 7ac92ec26..179ecd406 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -8032,3 +8032,15 @@ CONFIG_ARCH_USE_MEMTEST=y # # end of Rust hacking # end of Kernel hacking +CONFIG_BPF_SYSCALL=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_BTF=y +CONFIG_DEBUG_INFO_DWARF4=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y +CONFIG_KPROBES=y +CONFIG_KPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_UPROBES=y +CONFIG_UPROBE_EVENTS=y +CONFIG_DEBUG_FS=y +CONFIG_MODULE_SIG_FORCE=n diff --git a/lfs/linux b/lfs/linux index 6a546d8b2..15b47cd3f 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.15 +VER = 6.10.11 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a630bc7b2463bdc312f8936210a54e92bbe4136fc78995c18d0ccafbcdb27cce5b7b0d4a6ba10c378e14e86855ee7e76e355acc0580f7441e4df64e7dbd8a4b7 +$(DL_FILE)_BLAKE2 = 55380d2af9fc535f6359cdb9b36612d1f81f2f140652f44bf927c320dda382109c9fb9591cc741914d3221e8d8bda954a10dbbeff8c163bf1ed57eff1831c8df install : $(TARGET) @@ -130,9 +130,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Patch performance monitoring restrictions to allow further hardening cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15.17-security-perf-allow-further-restriction-of-perf_event_open.patch - # https://bugzilla.ipfire.org/show_bug.cgi?id=12760 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15-NFQUEUE-Hold-RCU-read-lock-while-calling-nf_reinject.patch - # Fix external module compile cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.0-fix_external_module_build.patch @@ -157,9 +154,7 @@ else # Cleanup kernel source cp $(DIR_SRC)/config/kernel/kernel.config.$(BUILD_ARCH)-$(VERSUFIX) $(DIR_APP)/.config - cp $(DIR_SRC)/config/kernel/kernel.config.bpf $(DIR_APP)/bpf-config cd $(DIR_APP) && make oldconfig - cd $(DIR_APP) && ./scripts/kconfig/merge_config.sh .config bpf-config cd $(DIR_APP) && make clean cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile @@ -234,7 +229,7 @@ endif # lunatik: copy resolve_btfids to /lib/modules/$(VER)-$(VERSUFIX)/build/tools/bpf/resolve_btfids/ # cop.btf.vmlinux.bin.o to vmlinux for lunatik kernel modules build cp -f $(DIR_APP)/tools/bpf/resolve_btfids/resolve_btfids /lib/modules/$(VER)-$(VERSUFIX)/build/tools/bpf/resolve_btfids/ - cp -f $(DIR_APP)/.btf.vmlinux.bin.o /lib/modules/$(VER)-$(VERSUFIX)/build/vmlinux + cp -f $(DIR_APP)/.tmp_vmlinux1.btf.o /lib/modules/$(VER)-$(VERSUFIX)/build/vmlinux # Fix permissions find /lib/modules/$(VER)-$(VERSUFIX) -name "modules.order" \ diff --git a/make.sh b/make.sh index f4d464ba2..c0ed5fc27 100755 --- a/make.sh +++ b/make.sh @@ -1726,7 +1726,6 @@ buildipfire() { # Kernelbuild ... current we have no platform that need # multi kernel builds so KCFG is empty lfsmake2 linux KCFG="" - lfsmake2 rtl8812au KCFG="" lfsmake2 linux-initrd KCFG="" # lunatik kernel module requires linux kernel to be built first lfsmake2 lunatik