From 14bd32221ecb35fc919c6a808621c63cff423094 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 9 Sep 2023 17:04:20 +0200 Subject: [PATCH] kernel: update to 6.1.52 Signed-off-by: Arne Fitzenreiter Signed-off-by: Michael Tremer --- config/kernel/kernel.config.aarch64-ipfire | 10 +++++----- config/kernel/kernel.config.riscv64-ipfire | 11 ++++++----- config/kernel/kernel.config.x86_64-ipfire | 10 +++++----- config/rootfiles/common/aarch64/linux | 4 ++-- config/rootfiles/common/riscv64/linux | 6 +++--- config/rootfiles/common/x86_64/linux | 4 ++-- lfs/linux | 4 ++-- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 74dec85650..38cfd7d531 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.45-ipfire Kernel Configuration +# Linux/arm64 6.1.52-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130100 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24000 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24000 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index aabf983711..82d19505f8 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.1.42-ipfire Kernel Configuration +# Linux/riscv 6.1.52-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130100 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24000 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24000 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -6936,6 +6936,7 @@ CONFIG_DEBUG_MISC=y # # Compile-time checks and compiler options # +CONFIG_AS_HAS_NON_CONST_LEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 7c052fe088..3eda0ec80e 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.45-ipfire Kernel Configuration +# Linux/x86 6.1.52-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130100 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24000 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24000 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 5ed37b7e03..754df396e7 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -17587,6 +17587,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/dccp/Makefile #lib/modules/KVER-ipfire/build/net/dccp/ccids #lib/modules/KVER-ipfire/build/net/dccp/ccids/Kconfig +#lib/modules/KVER-ipfire/build/net/devlink +#lib/modules/KVER-ipfire/build/net/devlink/Makefile #lib/modules/KVER-ipfire/build/net/dns_resolver #lib/modules/KVER-ipfire/build/net/dns_resolver/Kconfig #lib/modules/KVER-ipfire/build/net/dns_resolver/Makefile @@ -19159,8 +19161,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix/Makefile -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/mptcp diff --git a/config/rootfiles/common/riscv64/linux b/config/rootfiles/common/riscv64/linux index bd5439ea47..48660ee40f 100644 --- a/config/rootfiles/common/riscv64/linux +++ b/config/rootfiles/common/riscv64/linux @@ -6147,7 +6147,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/asm-generic/bitops/sched.h #lib/modules/KVER-ipfire/build/include/asm-generic/bitsperlong.h #lib/modules/KVER-ipfire/build/include/asm-generic/bug.h -#lib/modules/KVER-ipfire/build/include/asm-generic/bugs.h #lib/modules/KVER-ipfire/build/include/asm-generic/cache.h #lib/modules/KVER-ipfire/build/include/asm-generic/cacheflush.h #lib/modules/KVER-ipfire/build/include/asm-generic/checksum.h @@ -6370,6 +6369,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ASYNC_TX_DMA #lib/modules/KVER-ipfire/build/include/config/ASYNC_XOR #lib/modules/KVER-ipfire/build/include/config/AS_HAS_INSN +#lib/modules/KVER-ipfire/build/include/config/AS_HAS_NON_CONST_LEB128 #lib/modules/KVER-ipfire/build/include/config/AS_IS_GNU #lib/modules/KVER-ipfire/build/include/config/AS_VERSION #lib/modules/KVER-ipfire/build/include/config/AT76C50X_USB @@ -16723,6 +16723,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/dccp/Makefile #lib/modules/KVER-ipfire/build/net/dccp/ccids #lib/modules/KVER-ipfire/build/net/dccp/ccids/Kconfig +#lib/modules/KVER-ipfire/build/net/devlink +#lib/modules/KVER-ipfire/build/net/devlink/Makefile #lib/modules/KVER-ipfire/build/net/dns_resolver #lib/modules/KVER-ipfire/build/net/dns_resolver/Kconfig #lib/modules/KVER-ipfire/build/net/dns_resolver/Makefile @@ -18295,8 +18297,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix/Makefile -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/mptcp diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index f2b488ef91..4ff096b5be 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -17676,6 +17676,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/dccp/Makefile #lib/modules/KVER-ipfire/build/net/dccp/ccids #lib/modules/KVER-ipfire/build/net/dccp/ccids/Kconfig +#lib/modules/KVER-ipfire/build/net/devlink +#lib/modules/KVER-ipfire/build/net/devlink/Makefile #lib/modules/KVER-ipfire/build/net/dns_resolver #lib/modules/KVER-ipfire/build/net/dns_resolver/Kconfig #lib/modules/KVER-ipfire/build/net/dns_resolver/Makefile @@ -19244,8 +19246,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix/Makefile -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/mptcp diff --git a/lfs/linux b/lfs/linux index 52f1fe167a..e4497a27a3 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.1.45 +VER = 6.1.52 ARM_PATCHES = 6.1.y-ipfire2 THISAPP = linux-$(VER) @@ -75,7 +75,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_BLAKE2 = 1889f12c4bf9d09a5c3d3addbe5de7989ebacdc89c01973b33e8e11faa989eb7a0f1666c3a78ffeb6b315ec1599ab51490a97079f2d4c2109c8888a88dcf03b7 +$(DL_FILE)_BLAKE2 = 1846d76626ed122323f0ad54b71cd94165beba4f6122af681ca4c44a8a31bf3a4e8522bc5e2c410c33236477b9f610a577d991e01245628183142a5d8ec8770d arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3 install : $(TARGET) -- 2.39.2