From f696f419ad5481d6597068d7d560eb480574dff2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 1 Jul 2021 08:56:26 +0200 Subject: [PATCH] kernel: update to 5.10.46 Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.aarch64-ipfire | 11 +++++++---- config/kernel/kernel.config.armv6l-ipfire | 10 ++++++---- config/kernel/kernel.config.i586-ipfire | 10 ++++++---- config/kernel/kernel.config.x86_64-ipfire | 11 +++++++---- config/rootfiles/common/aarch64/linux | 6 ++++++ config/rootfiles/common/i586/linux | 4 ++++ config/rootfiles/common/x86_64/linux | 4 ++++ lfs/linux | 6 +++--- 8 files changed, 43 insertions(+), 19 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 3ed7f6e8b..a0cc957d4 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,16 +1,17 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.44-ipfire Kernel Configuration +# Linux/arm64 5.10.46-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 -CONFIG_LD_VERSION=235010000 +CONFIG_GCC_VERSION=110100 +CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -7732,6 +7733,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_UBSAN is not set +CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments CONFIG_DEBUG_KERNEL=y @@ -7768,6 +7770,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set # end of Memory Debugging diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire index 90022e618..df5458f29 100644 --- a/config/kernel/kernel.config.armv6l-ipfire +++ b/config/kernel/kernel.config.armv6l-ipfire @@ -1,16 +1,17 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.44-ipfire Kernel Configuration +# Linux/arm 5.10.46-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 -CONFIG_LD_VERSION=235010000 +CONFIG_GCC_VERSION=110100 +CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -7811,6 +7812,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments CONFIG_DEBUG_KERNEL=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index c1903f76d..f865a9492 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,16 +1,17 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.44-ipfire Kernel Configuration +# Linux/x86 5.10.46-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 -CONFIG_LD_VERSION=235010000 +CONFIG_GCC_VERSION=110100 +CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -7363,6 +7364,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_UBSAN is not set +CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments CONFIG_DEBUG_KERNEL=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 653d8f3c8..6d5d1a911 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,16 +1,17 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.44-ipfire Kernel Configuration +# Linux/x86 5.10.46-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 -CONFIG_LD_VERSION=235010000 +CONFIG_GCC_VERSION=110100 +CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -7228,6 +7229,8 @@ CONFIG_HAVE_ARCH_KGDB=y CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KCSAN=y +CONFIG_HAVE_KCSAN_COMPILER=y +# CONFIG_KCSAN is not set # end of Generic Kernel Debugging Instruments CONFIG_DEBUG_KERNEL=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 172ccaf5e..cf78b4e7c 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -7034,7 +7034,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/cc/can/link/static.h #lib/modules/KVER-ipfire/build/include/config/cc/has #lib/modules/KVER-ipfire/build/include/config/cc/has/asm +#lib/modules/KVER-ipfire/build/include/config/cc/has/asm/goto #lib/modules/KVER-ipfire/build/include/config/cc/has/asm/goto.h +#lib/modules/KVER-ipfire/build/include/config/cc/has/asm/goto/output.h #lib/modules/KVER-ipfire/build/include/config/cc/has/asm/inline.h #lib/modules/KVER-ipfire/build/include/config/cc/has/branch #lib/modules/KVER-ipfire/build/include/config/cc/has/branch/prot @@ -7045,6 +7047,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/cc/has/int128.h #lib/modules/KVER-ipfire/build/include/config/cc/has/kasan #lib/modules/KVER-ipfire/build/include/config/cc/has/kasan/generic.h +#lib/modules/KVER-ipfire/build/include/config/cc/has/kasan/sw +#lib/modules/KVER-ipfire/build/include/config/cc/has/kasan/sw/tags.h #lib/modules/KVER-ipfire/build/include/config/cc/has/sancov #lib/modules/KVER-ipfire/build/include/config/cc/has/sancov/trace #lib/modules/KVER-ipfire/build/include/config/cc/has/sancov/trace/pc.h @@ -8335,6 +8339,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/have/irq #lib/modules/KVER-ipfire/build/include/config/have/irq/time #lib/modules/KVER-ipfire/build/include/config/have/irq/time/accounting.h +#lib/modules/KVER-ipfire/build/include/config/have/kcsan +#lib/modules/KVER-ipfire/build/include/config/have/kcsan/compiler.h #lib/modules/KVER-ipfire/build/include/config/have/kprobes.h #lib/modules/KVER-ipfire/build/include/config/have/kretprobes.h #lib/modules/KVER-ipfire/build/include/config/have/mod diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 4a269739b..be510dd60 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -6930,7 +6930,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/cc/can/link/static.h #lib/modules/KVER-ipfire/build/include/config/cc/has #lib/modules/KVER-ipfire/build/include/config/cc/has/asm +#lib/modules/KVER-ipfire/build/include/config/cc/has/asm/goto #lib/modules/KVER-ipfire/build/include/config/cc/has/asm/goto.h +#lib/modules/KVER-ipfire/build/include/config/cc/has/asm/goto/output.h #lib/modules/KVER-ipfire/build/include/config/cc/has/asm/inline.h #lib/modules/KVER-ipfire/build/include/config/cc/has/kasan #lib/modules/KVER-ipfire/build/include/config/cc/has/kasan/generic.h @@ -8395,6 +8397,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/have/irq #lib/modules/KVER-ipfire/build/include/config/have/irq/time #lib/modules/KVER-ipfire/build/include/config/have/irq/time/accounting.h +#lib/modules/KVER-ipfire/build/include/config/have/kcsan +#lib/modules/KVER-ipfire/build/include/config/have/kcsan/compiler.h #lib/modules/KVER-ipfire/build/include/config/have/kernel #lib/modules/KVER-ipfire/build/include/config/have/kernel/bzip2.h #lib/modules/KVER-ipfire/build/include/config/have/kernel/gzip.h diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index e75f86f46..f2af873f8 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -6968,7 +6968,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/cc/can/link/static.h #lib/modules/KVER-ipfire/build/include/config/cc/has #lib/modules/KVER-ipfire/build/include/config/cc/has/asm +#lib/modules/KVER-ipfire/build/include/config/cc/has/asm/goto #lib/modules/KVER-ipfire/build/include/config/cc/has/asm/goto.h +#lib/modules/KVER-ipfire/build/include/config/cc/has/asm/goto/output.h #lib/modules/KVER-ipfire/build/include/config/cc/has/asm/inline.h #lib/modules/KVER-ipfire/build/include/config/cc/has/int128.h #lib/modules/KVER-ipfire/build/include/config/cc/has/kasan @@ -8420,6 +8422,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/have/irq #lib/modules/KVER-ipfire/build/include/config/have/irq/time #lib/modules/KVER-ipfire/build/include/config/have/irq/time/accounting.h +#lib/modules/KVER-ipfire/build/include/config/have/kcsan +#lib/modules/KVER-ipfire/build/include/config/have/kcsan/compiler.h #lib/modules/KVER-ipfire/build/include/config/have/kernel #lib/modules/KVER-ipfire/build/include/config/have/kernel/bzip2.h #lib/modules/KVER-ipfire/build/include/config/have/kernel/gzip.h diff --git a/lfs/linux b/lfs/linux index 114936ad4..6942f3957 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 5.10.45 -ARM_PATCHES = 5.10.45-ipfire0 +VER = 5.10.46 +ARM_PATCHES = 5.10.46-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -77,7 +77,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 8a66e7447c0388028abb5899961724e6 +$(DL_FILE)_MD5 = 38ad744241074e0c02f3152364988785 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 1b66be2d80c102c6c1963e9f601e5099 install : $(TARGET) -- 2.39.2