From: Arne Fitzenreiter Date: Fri, 11 Oct 2024 11:17:53 +0000 (+0200) Subject: kernel: update to 6.6.56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=019f139b20611ed782e9b79d8ed6d6583b9d13e9;p=people%2Fms%2Fipfire-2.x.git kernel: update to 6.6.56 Signed-off-by: Arne Fitzenreiter --- diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 74085de00..e3ea04138 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,20 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.45-ipfire Kernel Configuration +# Linux/arm64 6.6.56 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.3.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130300 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24300 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24300 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -386,6 +387,7 @@ CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y +CONFIG_ARM64_ERRATUM_3194386=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -770,6 +772,7 @@ CONFIG_HAVE_ARCH_COMPILER_H=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_ARCH_HAS_RELR=y +CONFIG_RELR=y CONFIG_HAVE_PREEMPT_DYNAMIC=y CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y @@ -8054,6 +8057,9 @@ CONFIG_KEYS=y # CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEY_DH_OPERATIONS is not set CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 6f0f1bfa5..f98042d1e 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.6.47-ipfire Kernel Configuration +# Linux/x86 6.6.56 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.3.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130300 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24300 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24300 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -7238,6 +7238,9 @@ CONFIG_KEYS=y # CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEY_DH_OPERATIONS is not set CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set @@ -7826,6 +7829,7 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=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 CONFIG_HAVE_ARCH_KFENCE=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 53dedd2f3..b07543290 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -7265,6 +7265,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/ARM64_ERRATUM_2658417 #lib/modules/KVER/build/include/config/ARM64_ERRATUM_2966298 #lib/modules/KVER/build/include/config/ARM64_ERRATUM_3117295 +#lib/modules/KVER/build/include/config/ARM64_ERRATUM_3194386 #lib/modules/KVER/build/include/config/ARM64_ERRATUM_819472 #lib/modules/KVER/build/include/config/ARM64_ERRATUM_824069 #lib/modules/KVER/build/include/config/ARM64_ERRATUM_826319 @@ -7968,6 +7969,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/CRYPTO_SHA512 #lib/modules/KVER/build/include/config/CRYPTO_SHA512_ARM64 #lib/modules/KVER/build/include/config/CRYPTO_SHA512_ARM64_CE +#lib/modules/KVER/build/include/config/CRYPTO_SIG #lib/modules/KVER/build/include/config/CRYPTO_SIG2 #lib/modules/KVER/build/include/config/CRYPTO_SKCIPHER #lib/modules/KVER/build/include/config/CRYPTO_SKCIPHER2 @@ -8421,6 +8423,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/FB_DMAMEM_HELPERS #lib/modules/KVER/build/include/config/FB_EFI #lib/modules/KVER/build/include/config/FB_IMX +#lib/modules/KVER/build/include/config/FB_IOMEM_FOPS #lib/modules/KVER/build/include/config/FB_IOMEM_HELPERS #lib/modules/KVER/build/include/config/FB_MODE_HELPERS #lib/modules/KVER/build/include/config/FB_NOTIFY @@ -8475,6 +8478,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/FSL_ERRATUM_A008585 #lib/modules/KVER/build/include/config/FSL_FMAN #lib/modules/KVER/build/include/config/FSL_GUTS +#lib/modules/KVER/build/include/config/FSL_IFC #lib/modules/KVER/build/include/config/FSL_IMX8_DDR_PMU #lib/modules/KVER/build/include/config/FSL_IMX9_DDR_PMU #lib/modules/KVER/build/include/config/FSL_MC_BUS @@ -8514,7 +8518,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/GACT_PROB #lib/modules/KVER/build/include/config/GARP #lib/modules/KVER/build/include/config/GCC10_NO_ARRAY_BOUNDS -#lib/modules/KVER/build/include/config/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER/build/include/config/GCC_PLUGINS #lib/modules/KVER/build/include/config/GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS #lib/modules/KVER/build/include/config/GCC_VERSION @@ -10207,6 +10210,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/PCI_SYSCALL #lib/modules/KVER/build/include/config/PCNET32 #lib/modules/KVER/build/include/config/PCPU_DEV_REFCNT +#lib/modules/KVER/build/include/config/PCP_BATCH_SCALE_MAX #lib/modules/KVER/build/include/config/PCS_LYNX #lib/modules/KVER/build/include/config/PCS_MTK_LYNXI #lib/modules/KVER/build/include/config/PCS_XPCS @@ -10354,6 +10358,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/PRINTK #lib/modules/KVER/build/include/config/PROC_EVENTS #lib/modules/KVER/build/include/config/PROC_FS +#lib/modules/KVER/build/include/config/PROC_MEM_ALWAYS_FORCE #lib/modules/KVER/build/include/config/PROC_PAGE_MONITOR #lib/modules/KVER/build/include/config/PROC_PID_CPUSET #lib/modules/KVER/build/include/config/PROC_SYSCTL @@ -10476,6 +10481,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/REISERFS_PROC_INFO #lib/modules/KVER/build/include/config/RELAY #lib/modules/KVER/build/include/config/RELOCATABLE +#lib/modules/KVER/build/include/config/RELR #lib/modules/KVER/build/include/config/RENESAS_PHY #lib/modules/KVER/build/include/config/RESET_ATTACK_MITIGATION #lib/modules/KVER/build/include/config/RESET_BERLIN @@ -10678,6 +10684,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/SCHED_STACK_END_CHECK #lib/modules/KVER/build/include/config/SCHED_THERMAL_PRESSURE #lib/modules/KVER/build/include/config/SCHED_TRACER +#lib/modules/KVER/build/include/config/SCREEN_INFO #lib/modules/KVER/build/include/config/SCSI #lib/modules/KVER/build/include/config/SCSI_BUSLOGIC #lib/modules/KVER/build/include/config/SCSI_COMMON @@ -11282,6 +11289,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/TMPFS #lib/modules/KVER/build/include/config/TMPFS_POSIX_ACL #lib/modules/KVER/build/include/config/TMPFS_XATTR +#lib/modules/KVER/build/include/config/TOOLS_SUPPORT_RELR #lib/modules/KVER/build/include/config/TRACEPOINTS #lib/modules/KVER/build/include/config/TRACER_MAX_TRACE #lib/modules/KVER/build/include/config/TRACER_SNAPSHOT @@ -13762,11 +13770,11 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/iio/accel/kxcjk_1013.h #lib/modules/KVER/build/include/linux/iio/adc #lib/modules/KVER/build/include/linux/iio/adc/ad_sigma_delta.h -#lib/modules/KVER/build/include/linux/iio/adc/adi-axi-adc.h #lib/modules/KVER/build/include/linux/iio/adc/qcom-vadc-common.h #lib/modules/KVER/build/include/linux/iio/adc/stm32-dfsdm-adc.h #lib/modules/KVER/build/include/linux/iio/afe #lib/modules/KVER/build/include/linux/iio/afe/rescale.h +#lib/modules/KVER/build/include/linux/iio/backend.h #lib/modules/KVER/build/include/linux/iio/buffer-dma.h #lib/modules/KVER/build/include/linux/iio/buffer-dmaengine.h #lib/modules/KVER/build/include/linux/iio/buffer.h @@ -15311,6 +15319,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/soc/actions/owl-sps.h #lib/modules/KVER/build/include/linux/soc/amlogic #lib/modules/KVER/build/include/linux/soc/amlogic/meson-canvas.h +#lib/modules/KVER/build/include/linux/soc/andes +#lib/modules/KVER/build/include/linux/soc/andes/irq.h #lib/modules/KVER/build/include/linux/soc/apple #lib/modules/KVER/build/include/linux/soc/apple/rtkit.h #lib/modules/KVER/build/include/linux/soc/apple/sart.h @@ -18466,6 +18476,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/scripts/Makefile.randstruct #lib/modules/KVER/build/scripts/Makefile.ubsan #lib/modules/KVER/build/scripts/Makefile.userprogs +#lib/modules/KVER/build/scripts/Makefile.vdsoinst #lib/modules/KVER/build/scripts/Makefile.vmlinux #lib/modules/KVER/build/scripts/Makefile.vmlinux_o #lib/modules/KVER/build/scripts/as-version.sh @@ -18806,7 +18817,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/scripts/kconfig/images.h #lib/modules/KVER/build/scripts/kconfig/internal.h #lib/modules/KVER/build/scripts/kconfig/lexer.l -#lib/modules/KVER/build/scripts/kconfig/lexer.lex.c #lib/modules/KVER/build/scripts/kconfig/list.h #lib/modules/KVER/build/scripts/kconfig/lkc.h #lib/modules/KVER/build/scripts/kconfig/lkc_proto.h @@ -18827,8 +18837,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/scripts/kconfig/nconf.c #lib/modules/KVER/build/scripts/kconfig/nconf.gui.c #lib/modules/KVER/build/scripts/kconfig/nconf.h -#lib/modules/KVER/build/scripts/kconfig/parser.tab.c -#lib/modules/KVER/build/scripts/kconfig/parser.tab.h #lib/modules/KVER/build/scripts/kconfig/parser.y #lib/modules/KVER/build/scripts/kconfig/preprocess.c #lib/modules/KVER/build/scripts/kconfig/qconf-cfg.sh diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index cecaf36fa..49e1dfe71 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -1607,6 +1607,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/arch/x86/include/asm/platform_sst_audio.h #lib/modules/KVER/build/arch/x86/include/asm/pm-trace.h #lib/modules/KVER/build/arch/x86/include/asm/posix_types.h +#lib/modules/KVER/build/arch/x86/include/asm/posted_intr.h #lib/modules/KVER/build/arch/x86/include/asm/preempt.h #lib/modules/KVER/build/arch/x86/include/asm/probe_roms.h #lib/modules/KVER/build/arch/x86/include/asm/processor-cyrix.h @@ -7314,6 +7315,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/CC_HAS_IBT #lib/modules/KVER/build/include/config/CC_HAS_INT128 #lib/modules/KVER/build/include/config/CC_HAS_KASAN_GENERIC +#lib/modules/KVER/build/include/config/CC_HAS_KASAN_SW_TAGS #lib/modules/KVER/build/include/config/CC_HAS_NO_PROFILE_FN_ATTR #lib/modules/KVER/build/include/config/CC_HAS_RETURN_THUNK #lib/modules/KVER/build/include/config/CC_HAS_SANCOV_TRACE_PC @@ -7597,6 +7599,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/CRYPTO_SHA3 #lib/modules/KVER/build/include/config/CRYPTO_SHA512 #lib/modules/KVER/build/include/config/CRYPTO_SHA512_SSSE3 +#lib/modules/KVER/build/include/config/CRYPTO_SIG #lib/modules/KVER/build/include/config/CRYPTO_SIG2 #lib/modules/KVER/build/include/config/CRYPTO_SIMD #lib/modules/KVER/build/include/config/CRYPTO_SKCIPHER @@ -8093,6 +8096,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/FB_HYPERV #lib/modules/KVER/build/include/config/FB_I740 #lib/modules/KVER/build/include/config/FB_IBM_GXT4500 +#lib/modules/KVER/build/include/config/FB_IOMEM_FOPS #lib/modules/KVER/build/include/config/FB_IOMEM_HELPERS #lib/modules/KVER/build/include/config/FB_KYRO #lib/modules/KVER/build/include/config/FB_LE80578 @@ -8197,7 +8201,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/GACT_PROB #lib/modules/KVER/build/include/config/GARP #lib/modules/KVER/build/include/config/GCC10_NO_ARRAY_BOUNDS -#lib/modules/KVER/build/include/config/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER/build/include/config/GCC_PLUGINS #lib/modules/KVER/build/include/config/GCC_VERSION #lib/modules/KVER/build/include/config/GENERIC_ALLOCATOR @@ -10011,6 +10014,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/PCI_XEN #lib/modules/KVER/build/include/config/PCNET32 #lib/modules/KVER/build/include/config/PCPU_DEV_REFCNT +#lib/modules/KVER/build/include/config/PCP_BATCH_SCALE_MAX #lib/modules/KVER/build/include/config/PCSPKR_PLATFORM #lib/modules/KVER/build/include/config/PCS_LYNX #lib/modules/KVER/build/include/config/PCS_MTK_LYNXI @@ -10112,6 +10116,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/PRINTK #lib/modules/KVER/build/include/config/PROC_EVENTS #lib/modules/KVER/build/include/config/PROC_FS +#lib/modules/KVER/build/include/config/PROC_MEM_ALWAYS_FORCE #lib/modules/KVER/build/include/config/PROC_PAGE_MONITOR #lib/modules/KVER/build/include/config/PROC_PID_ARCH_STATUS #lib/modules/KVER/build/include/config/PROC_PID_CPUSET @@ -10418,6 +10423,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/SCHED_SMT #lib/modules/KVER/build/include/config/SCHED_STACK_END_CHECK #lib/modules/KVER/build/include/config/SCHED_TRACER +#lib/modules/KVER/build/include/config/SCREEN_INFO #lib/modules/KVER/build/include/config/SCSI #lib/modules/KVER/build/include/config/SCSI_3W_9XXX #lib/modules/KVER/build/include/config/SCSI_3W_SAS @@ -13780,11 +13786,11 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/iio/accel/kxcjk_1013.h #lib/modules/KVER/build/include/linux/iio/adc #lib/modules/KVER/build/include/linux/iio/adc/ad_sigma_delta.h -#lib/modules/KVER/build/include/linux/iio/adc/adi-axi-adc.h #lib/modules/KVER/build/include/linux/iio/adc/qcom-vadc-common.h #lib/modules/KVER/build/include/linux/iio/adc/stm32-dfsdm-adc.h #lib/modules/KVER/build/include/linux/iio/afe #lib/modules/KVER/build/include/linux/iio/afe/rescale.h +#lib/modules/KVER/build/include/linux/iio/backend.h #lib/modules/KVER/build/include/linux/iio/buffer-dma.h #lib/modules/KVER/build/include/linux/iio/buffer-dmaengine.h #lib/modules/KVER/build/include/linux/iio/buffer.h @@ -15329,6 +15335,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/soc/actions/owl-sps.h #lib/modules/KVER/build/include/linux/soc/amlogic #lib/modules/KVER/build/include/linux/soc/amlogic/meson-canvas.h +#lib/modules/KVER/build/include/linux/soc/andes +#lib/modules/KVER/build/include/linux/soc/andes/irq.h #lib/modules/KVER/build/include/linux/soc/apple #lib/modules/KVER/build/include/linux/soc/apple/rtkit.h #lib/modules/KVER/build/include/linux/soc/apple/sart.h @@ -18484,6 +18492,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/scripts/Makefile.randstruct #lib/modules/KVER/build/scripts/Makefile.ubsan #lib/modules/KVER/build/scripts/Makefile.userprogs +#lib/modules/KVER/build/scripts/Makefile.vdsoinst #lib/modules/KVER/build/scripts/Makefile.vmlinux #lib/modules/KVER/build/scripts/Makefile.vmlinux_o #lib/modules/KVER/build/scripts/as-version.sh @@ -18819,7 +18828,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/scripts/kconfig/images.h #lib/modules/KVER/build/scripts/kconfig/internal.h #lib/modules/KVER/build/scripts/kconfig/lexer.l -#lib/modules/KVER/build/scripts/kconfig/lexer.lex.c #lib/modules/KVER/build/scripts/kconfig/list.h #lib/modules/KVER/build/scripts/kconfig/lkc.h #lib/modules/KVER/build/scripts/kconfig/lkc_proto.h @@ -18840,8 +18848,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/scripts/kconfig/nconf.c #lib/modules/KVER/build/scripts/kconfig/nconf.gui.c #lib/modules/KVER/build/scripts/kconfig/nconf.h -#lib/modules/KVER/build/scripts/kconfig/parser.tab.c -#lib/modules/KVER/build/scripts/kconfig/parser.tab.h #lib/modules/KVER/build/scripts/kconfig/parser.y #lib/modules/KVER/build/scripts/kconfig/preprocess.c #lib/modules/KVER/build/scripts/kconfig/qconf-cfg.sh @@ -20395,6 +20401,7 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/edac/pnd2_edac.ko.xz #lib/modules/KVER/kernel/drivers/edac/sb_edac.ko.xz #lib/modules/KVER/kernel/drivers/edac/skx_edac.ko.xz +#lib/modules/KVER/kernel/drivers/edac/skx_edac_common.ko.xz #lib/modules/KVER/kernel/drivers/edac/x38_edac.ko.xz #lib/modules/KVER/kernel/drivers/extcon #lib/modules/KVER/kernel/drivers/extcon/extcon-usbc-tusb320.ko.xz diff --git a/config/rootfiles/core/190/filelists/aarch64/linux b/config/rootfiles/core/190/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/190/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/190/filelists/riscv64/linux b/config/rootfiles/core/190/filelists/riscv64/linux new file mode 120000 index 000000000..c8e8350ca --- /dev/null +++ b/config/rootfiles/core/190/filelists/riscv64/linux @@ -0,0 +1 @@ +../../../../common/riscv64/linux \ No newline at end of file diff --git a/config/rootfiles/core/190/filelists/x86_64/linux b/config/rootfiles/core/190/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/190/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/190/update.sh b/config/rootfiles/core/190/update.sh index d301b0c9e..16ef608e2 100644 --- a/config/rootfiles/core/190/update.sh +++ b/config/rootfiles/core/190/update.sh @@ -26,6 +26,18 @@ core=190 +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + # Remove old core updates from pakfire cache to save space... for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire @@ -34,6 +46,47 @@ done # Stop services /etc/init.d/suricata stop +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks prior to the kernel update +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root and size of boot +ROOTSPACE=$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 ) +if [ $ROOTSPACE -lt 200000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 +fi +BOOTSIZE=$( df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1 ) +if [ $BOOTSIZE -lt 100000 ]; then + exit_with_error "ERROR cannot update. BOOT partition is to small." 3 +fi + +# Remove the old kernel +rm -rvf \ + /boot/System.map-* \ + /boot/config-* \ + /boot/ipfirerd-* \ + /boot/initramfs-* \ + /boot/vmlinuz-* \ + /boot/uImage-* \ + /boot/zImage-* \ + /boot/uInit-* \ + /boot/dtb-* \ + /lib/modules + + # Remove the metadata for ncat (if installed) as this is now part of the core system rm -f "/opt/pakfire/db/installed/meta-ncat" rm -f "/opt/pakfire/db/meta/meta-ncat" @@ -42,8 +95,6 @@ rm -f "/opt/pakfire/db/rootfiles/ncat" # Extract files extract_files -# Remove files - # update linker config ldconfig @@ -69,6 +120,31 @@ fi /etc/init.d/suricata start /etc/init.d/unbound restart + +# Regenerate Suricata rule files +perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::write_used_rulefiles_file(&IDS::get_enabled_providers());" +/etc/init.d/suricata reload + +# Build initial ramdisks +dracut --regenerate-all --force +KVER="xxxKVERxxx" +case "$(uname -m)" in + aarch64) + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}.img /boot/uInit-${KVER} + # dont remove initramfs because grub need this to boot. + ;; +esac + +# Upadate Kernel version in uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# Call user update script (needed for some ARM boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + # This update needs a reboot... touch /var/run/need_reboot diff --git a/lfs/linux b/lfs/linux index 36b8f5341..11aafd68e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.47 +VER = 6.6.56 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -68,7 +68,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = ece3be3257b205c3d56c71525b95798347ab40b00d9ca54f0812a5407725512613075e85b3a6a0f3bfc4a59c714438efc4c08ed171a3f92e62cc3e4046f87a1f +$(DL_FILE)_BLAKE2 = c33477493337b759023dcff084360edcb3b0b53cc9543bd64537a9fdc736cc4d6c17d0b357e7a60141021bd9d1f46caaa997d8be8e75261fad657f4d9f058e12 install : $(TARGET)