From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4g8x4k6363z2y6G for ; Tue, 05 May 2026 11:24:54 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4g8x4k5dqDz2xKC for ; Tue, 05 May 2026 11:24:54 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bit raw public key) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4g8x4j32glz2Vg for ; Tue, 05 May 2026 11:24:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1777980293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=KgD3OVyHf9qr88sY3o/r7D4lRF4mVVvBqHeF42kf4Rs=; b=EpMj3JINO0590imrE/yAftUP/s9gv2yh66mprHJM12XkHHxJr6YACoM7wRWXRWq93s/FKS h8miUivMdkaboLCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1777980293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=KgD3OVyHf9qr88sY3o/r7D4lRF4mVVvBqHeF42kf4Rs=; b=Be2dObgOP1atO+x3kLXv/lqk9J9skiejSVrAX5aAkWd4E4Z8LTgg12vRGxNCgTYF4xSHAS JCD3LMA1wb7PtsbHeIoa3UOUbEUdRtvxSj8LuLVchMVGgmFaMD49dipQmxcbxg9oTNRFaf CNUujQs+oQtbaGX3jb+HMGgeWVZ6H4WN9a6f5HP/5WnbWgskcfsBLBZgYFyWxY2VQITSOc l6t/50vLr1bwIrO45q1mBxbuL7+FtPvBnq08YzlvRs5rxXbevi3038W87rrkKpbXiKfXTg 9rPov+GG1olE4+ChVRLNQ/Pwbkt3ywYK6aQQLIxHwzZI/Oy6nijcjkK53ob4hA== Received: by people01.haj.ipfire.org (Postfix, from userid 1001) id 4g8x4j13zmz2y60; Tue, 05 May 2026 11:24:53 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 58b474fc6d8e96938a0ba5a8521464854a10a2a0 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 60c49e56542d40a4ec985adab033f12d7e804957 X-Git-Newrev: 58b474fc6d8e96938a0ba5a8521464854a10a2a0 Message-Id: <4g8x4j13zmz2y60@people01.haj.ipfire.org> Date: Tue, 05 May 2026 11:24:52 +0000 (UTC) From: Arne Fitzenreiter Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 58b474fc6d8e96938a0ba5a8521464854a10a2a0 (commit) via 90f6c9e5383bf8c1a966c03b47e718aef6b5d4bc (commit) from 60c49e56542d40a4ec985adab033f12d7e804957 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 58b474fc6d8e96938a0ba5a8521464854a10a2a0 Author: Arne Fitzenreiter Date: Tue May 5 13:23:39 2026 +0200 core202: ship kernel Signed-off-by: Arne Fitzenreiter commit 90f6c9e5383bf8c1a966c03b47e718aef6b5d4bc Author: Arne Fitzenreiter Date: Tue May 5 13:22:32 2026 +0200 kernel: update to 6.18.28 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 21 ++++--- config/kernel/kernel.config.x86_64-ipfire | 20 +++--- config/rootfiles/common/aarch64/linux | 9 ++- config/rootfiles/common/x86_64/linux | 8 ++- .../124 => core/202}/filelists/aarch64/linux | 0 .../181 => core/202}/filelists/riscv64/linux | 0 .../100 => core/202}/filelists/x86_64/linux | 0 config/rootfiles/core/202/update.sh | 73 ++++++++++++++++++++++ lfs/linux | 4 +- 9 files changed, 114 insertions(+), 21 deletions(-) copy config/rootfiles/{oldcore/124 => core/202}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/181 => core/202}/filelists/riscv64/linux (100%) copy config/rootfiles/{oldcore/100 => core/202}/filelists/x86_64/linux (100%) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index f92c33d5a..be537f2db 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,18 +1,18 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.18.7 Kernel Configuration +# Linux/arm64 6.18.26 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=150200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24500 +CONFIG_AS_VERSION=24600 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24500 +CONFIG_LD_VERSION=24600 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=108500 -CONFIG_RUSTC_LLVM_VERSION=190107 +CONFIG_RUSTC_VERSION=109200 +CONFIG_RUSTC_LLVM_VERSION=210103 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y @@ -24,6 +24,10 @@ CONFIG_CC_HAS_COUNTED_BY=y CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y CONFIG_RUSTC_HAS_COERCE_POINTEE=y +CONFIG_RUSTC_HAS_SPAN_FILE=y +CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y +CONFIG_RUSTC_HAS_FILE_WITH_NUL=y +CONFIG_RUSTC_HAS_FILE_AS_C_STR=y CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -424,6 +428,7 @@ CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4193714=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -3851,7 +3856,7 @@ CONFIG_SERIAL_EARLYCON_SEMIHOST=y CONFIG_SERIAL_MESON=y CONFIG_SERIAL_MESON_CONSOLE=y CONFIG_SERIAL_IMX=m -CONFIG_SERIAL_IMX_CONSOLE=m +CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_IMX_EARLYCON=y CONFIG_SERIAL_UARTLITE=y CONFIG_SERIAL_UARTLITE_CONSOLE=y @@ -4800,6 +4805,7 @@ CONFIG_MFD_AXP20X_I2C=y # CONFIG_MFD_CS42L43_I2C is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_MADERA is not set +# CONFIG_MFD_TN48M_CPLD is not set # CONFIG_PMIC_DA903X is not set # CONFIG_MFD_DA9052_I2C is not set # CONFIG_MFD_DA9055 is not set @@ -5925,6 +5931,7 @@ CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y CONFIG_DRM_TTM=m CONFIG_DRM_EXEC=m CONFIG_DRM_GPUVM=m +CONFIG_DRM_GPUSVM=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m @@ -5995,6 +6002,7 @@ CONFIG_DRM_XE_FORCE_PROBE="" # CONFIG_DRM_XE_DEBUG_MEMIRQ is not set # CONFIG_DRM_XE_DEBUG_SRIOV is not set # CONFIG_DRM_XE_DEBUG_MEM is not set +# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set # end of drm/Xe Debugging # @@ -9496,7 +9504,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y # CONFIG_DEBUG_IRQFLAGS is not set CONFIG_STACKTRACE=y -# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set # diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 3281c59af..3a36c24d0 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,18 +1,18 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.18.7 Kernel Configuration +# Linux/x86 6.18.26 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=150200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24500 +CONFIG_AS_VERSION=24600 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24500 +CONFIG_LD_VERSION=24600 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=108500 -CONFIG_RUSTC_LLVM_VERSION=190107 +CONFIG_RUSTC_VERSION=109200 +CONFIG_RUSTC_LLVM_VERSION=210103 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y @@ -24,6 +24,10 @@ CONFIG_CC_HAS_COUNTED_BY=y CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y CONFIG_RUSTC_HAS_COERCE_POINTEE=y +CONFIG_RUSTC_HAS_SPAN_FILE=y +CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y +CONFIG_RUSTC_HAS_FILE_WITH_NUL=y +CONFIG_RUSTC_HAS_FILE_AS_C_STR=y CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -839,6 +843,8 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_UNWIND_USER=y +CONFIG_HAVE_UNWIND_USER_FP=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y @@ -3250,7 +3256,6 @@ CONFIG_ATH9K_COMMON=m CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y -CONFIG_ATH9K_AHB=y CONFIG_ATH9K_DFS_CERTIFIED=y # CONFIG_ATH9K_DYNACK is not set # CONFIG_ATH9K_WOW is not set @@ -5623,6 +5628,7 @@ CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_TTM=m CONFIG_DRM_EXEC=m CONFIG_DRM_GPUVM=m +CONFIG_DRM_GPUSVM=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m @@ -5727,6 +5733,7 @@ CONFIG_DRM_XE_FORCE_PROBE="" # CONFIG_DRM_XE_DEBUG_MEMIRQ is not set # CONFIG_DRM_XE_DEBUG_SRIOV is not set # CONFIG_DRM_XE_DEBUG_MEM is not set +# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set # end of drm/Xe Debugging # @@ -8388,7 +8395,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y # CONFIG_NMI_CHECK_CPU is not set # CONFIG_DEBUG_IRQFLAGS is not set CONFIG_STACKTRACE=y -# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set # diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 268c43e4b..334bcc44c 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -736,7 +736,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/.config #lib/modules/KVER/build/Kconfig #lib/modules/KVER/build/Makefile -#lib/modules/KVER/build/Makefile.orig #lib/modules/KVER/build/Module.symvers #lib/modules/KVER/build/System.map #lib/modules/KVER/build/arch @@ -8001,6 +8000,7 @@ etc/modprobe.d/ipv6.conf #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_4193714 #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 @@ -8917,6 +8917,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/DRM_GEM_DMA_HELPER #lib/modules/KVER/build/include/config/DRM_GEM_SHMEM_HELPER #lib/modules/KVER/build/include/config/DRM_GM12U320 +#lib/modules/KVER/build/include/config/DRM_GPUSVM #lib/modules/KVER/build/include/config/DRM_GPUVM #lib/modules/KVER/build/include/config/DRM_GUD #lib/modules/KVER/build/include/config/DRM_HDLCD @@ -11777,6 +11778,10 @@ 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_HAS_COERCE_POINTEE +#lib/modules/KVER/build/include/config/RUSTC_HAS_FILE_AS_C_STR +#lib/modules/KVER/build/include/config/RUSTC_HAS_FILE_WITH_NUL +#lib/modules/KVER/build/include/config/RUSTC_HAS_SPAN_FILE +#lib/modules/KVER/build/include/config/RUSTC_HAS_UNNECESSARY_TRANSMUTES #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 @@ -15343,7 +15348,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/input #lib/modules/KVER/build/include/linux/input.h #lib/modules/KVER/build/include/linux/input/ad714x.h -#lib/modules/KVER/build/include/linux/input/adp5589.h #lib/modules/KVER/build/include/linux/input/adxl34x.h #lib/modules/KVER/build/include/linux/input/as5011.h #lib/modules/KVER/build/include/linux/input/cma3000.h @@ -22465,6 +22469,7 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/gpu/drm/drm_buddy.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_dma_helper.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_exec.ko.xz +#lib/modules/KVER/kernel/drivers/gpu/drm/drm_gpusvm_helper.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_gpuvm.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_panel_backlight_quirks.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_suballoc_helper.ko.xz diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 2092db35d..ccc825219 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -1705,6 +1705,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/arch/x86/include/asm/unistd.h #lib/modules/KVER/build/arch/x86/include/asm/unwind.h #lib/modules/KVER/build/arch/x86/include/asm/unwind_hints.h +#lib/modules/KVER/build/arch/x86/include/asm/unwind_user.h #lib/modules/KVER/build/arch/x86/include/asm/uprobes.h #lib/modules/KVER/build/arch/x86/include/asm/user.h #lib/modules/KVER/build/arch/x86/include/asm/user32.h @@ -1770,7 +1771,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/arch/x86/include/generated/asm/syscalls_64.h #lib/modules/KVER/build/arch/x86/include/generated/asm/unistd_32_ia32.h #lib/modules/KVER/build/arch/x86/include/generated/asm/unistd_64_x32.h -#lib/modules/KVER/build/arch/x86/include/generated/asm/unwind_user.h #lib/modules/KVER/build/arch/x86/include/generated/asm/xen-hypercalls.h #lib/modules/KVER/build/arch/x86/include/generated/uapi #lib/modules/KVER/build/arch/x86/include/generated/uapi/asm @@ -7523,7 +7523,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/ATH5K_DEBUG #lib/modules/KVER/build/include/config/ATH5K_PCI #lib/modules/KVER/build/include/config/ATH9K -#lib/modules/KVER/build/include/config/ATH9K_AHB #lib/modules/KVER/build/include/config/ATH9K_BTCOEX_SUPPORT #lib/modules/KVER/build/include/config/ATH9K_COMMON #lib/modules/KVER/build/include/config/ATH9K_DFS_CERTIFIED @@ -8220,6 +8219,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/DRM_GEM_SHMEM_HELPER #lib/modules/KVER/build/include/config/DRM_GM12U320 #lib/modules/KVER/build/include/config/DRM_GMA500 +#lib/modules/KVER/build/include/config/DRM_GPUSVM #lib/modules/KVER/build/include/config/DRM_GPUVM #lib/modules/KVER/build/include/config/DRM_GUD #lib/modules/KVER/build/include/config/DRM_HYPERV @@ -8898,6 +8898,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/HAVE_SYSCALL_TRACEPOINTS #lib/modules/KVER/build/include/config/HAVE_UACCESS_VALIDATION #lib/modules/KVER/build/include/config/HAVE_UNSTABLE_SCHED_CLOCK +#lib/modules/KVER/build/include/config/HAVE_UNWIND_USER_FP #lib/modules/KVER/build/include/config/HAVE_USER_RETURN_NOTIFIER #lib/modules/KVER/build/include/config/HAVE_VIRT_CPU_ACCOUNTING_GEN #lib/modules/KVER/build/include/config/HDMI @@ -11865,6 +11866,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/UNIX98_PTYS #lib/modules/KVER/build/include/config/UNIX_DIAG #lib/modules/KVER/build/include/config/UNWINDER_ORC +#lib/modules/KVER/build/include/config/UNWIND_USER #lib/modules/KVER/build/include/config/USB #lib/modules/KVER/build/include/config/USBIP_CORE #lib/modules/KVER/build/include/config/USBIP_HOST @@ -14848,7 +14850,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/input #lib/modules/KVER/build/include/linux/input.h #lib/modules/KVER/build/include/linux/input/ad714x.h -#lib/modules/KVER/build/include/linux/input/adp5589.h #lib/modules/KVER/build/include/linux/input/adxl34x.h #lib/modules/KVER/build/include/linux/input/as5011.h #lib/modules/KVER/build/include/linux/input/cma3000.h @@ -21953,6 +21954,7 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/gpu/drm/display/drm_display_helper.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_buddy.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_exec.ko.xz +#lib/modules/KVER/kernel/drivers/gpu/drm/drm_gpusvm_helper.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_gpuvm.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_panel_backlight_quirks.ko.xz #lib/modules/KVER/kernel/drivers/gpu/drm/drm_suballoc_helper.ko.xz diff --git a/config/rootfiles/core/202/filelists/aarch64/linux b/config/rootfiles/core/202/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/202/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/202/filelists/riscv64/linux b/config/rootfiles/core/202/filelists/riscv64/linux new file mode 120000 index 000000000..c8e8350ca --- /dev/null +++ b/config/rootfiles/core/202/filelists/riscv64/linux @@ -0,0 +1 @@ +../../../../common/riscv64/linux \ No newline at end of file diff --git a/config/rootfiles/core/202/filelists/x86_64/linux b/config/rootfiles/core/202/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/202/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/202/update.sh b/config/rootfiles/core/202/update.sh index 6c3a326d0..69e16aead 100644 --- a/config/rootfiles/core/202/update.sh +++ b/config/rootfiles/core/202/update.sh @@ -26,11 +26,64 @@ core=202 +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 done +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 + + # Delete the dnsmasq user if exists if getent passwd dnsmasq >/dev/null; then userdel dnsmasq @@ -114,6 +167,26 @@ fcrontab -z # Remove Suricata's stats.log rm -vf /var/log/suricata/stats.log* +# 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 bd5725b61..4bb361bc9 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.18.7 +VER = 6.18.26 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -69,7 +69,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3ad31b9b36ea2c8f865c87e63c97a4e7b6684abee35ae71d5838026de9f476edb4c847adab315235293c5f37f8f3b90799ae2b3d41915716710eae63acbf6863 +$(DL_FILE)_BLAKE2 = fbd4c50e480176135a81dfffa94e7bbb3b5bafa91555c5c6201c9f1d0c883a5fbe0c2cc60b9ae14f722946ff2559a1f4dc8015e2e217cb9c161c5f46860594dd install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree