From 7aa181ec1fd492c1a60df67782257c144bb693dc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 11 Jan 2025 08:47:27 +0000 Subject: [PATCH] kernel: update to 6.12.9 Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.aarch64-ipfire | 8 +++++--- config/kernel/kernel.config.x86_64-ipfire | 7 ++++--- config/rootfiles/common/aarch64/linux | 2 ++ lfs/linux | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 43fa47eb4..a6d6fdfb0 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.8 Kernel Configuration +# Linux/arm64 6.12.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y @@ -11,8 +11,8 @@ CONFIG_AS_VERSION=24300 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24300 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=106700 -CONFIG_RUSTC_LLVM_VERSION=150006 +CONFIG_RUSTC_VERSION=108300 +CONFIG_RUSTC_LLVM_VERSION=190101 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y @@ -277,6 +277,7 @@ CONFIG_TRACEPOINTS=y # end of General setup CONFIG_ARM64=y +CONFIG_RUSTC_SUPPORTS_ARM64=y CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y @@ -723,6 +724,7 @@ CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_RUST=y CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_PERF_REGS=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 3a9767fde..16d9f501a 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.12.8 Kernel Configuration +# Linux/x86 6.12.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y @@ -11,8 +11,8 @@ CONFIG_AS_VERSION=24300 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24300 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=106700 -CONFIG_RUSTC_LLVM_VERSION=150006 +CONFIG_RUSTC_VERSION=108300 +CONFIG_RUSTC_LLVM_VERSION=190101 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y @@ -2082,6 +2082,7 @@ CONFIG_EFI_EARLYCON=y CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y +# CONFIG_IMX_SCMI_MISC_DRV is not set # # Qualcomm firmware drivers diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index b0b48683a..dd1278c00 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -9071,6 +9071,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/HAVE_PREEMPT_DYNAMIC_KEY #lib/modules/KVER/build/include/config/HAVE_REGS_AND_STACK_ACCESS_API #lib/modules/KVER/build/include/config/HAVE_RSEQ +#lib/modules/KVER/build/include/config/HAVE_RUST #lib/modules/KVER/build/include/config/HAVE_SAMPLE_FTRACE_DIRECT #lib/modules/KVER/build/include/config/HAVE_SAMPLE_FTRACE_DIRECT_MULTI #lib/modules/KVER/build/include/config/HAVE_SOFTIRQ_ON_OWN_STACK @@ -11103,6 +11104,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/RT_GROUP_SCHED #lib/modules/KVER/build/include/config/RT_MUTEXES #lib/modules/KVER/build/include/config/RUSTC_LLVM_VERSION +#lib/modules/KVER/build/include/config/RUSTC_SUPPORTS_ARM64 #lib/modules/KVER/build/include/config/RUSTC_VERSION #lib/modules/KVER/build/include/config/RWSEM_SPIN_ON_OWNER #lib/modules/KVER/build/include/config/S2IO diff --git a/lfs/linux b/lfs/linux index c081e89bf..9c613a379 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.12.8 +VER = 6.12.9 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -69,7 +69,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 62a3f435bbe7d24bea361f2545ba50f8b36030a98bd28d0979b86052d8af34dc7a4c27f7ca2890daba5e5bb51f5848e6b21cd5df4dbbd19919867bf67d38790d +$(DL_FILE)_BLAKE2 = 2584e35822a429b6825bf8d99c073848d5ba83d45b382ab82d1caa36ccbf2529036b31d4687dafb29650c87f4b63489caa2cb67a85d05183c572dcad75a35ba8 install : $(TARGET) -- 2.39.5