* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0d8071449430e608ccf9586f844ec8c02f2b5c6d
@ 2026-06-30 7:17 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2026-06-30 7:17 UTC (permalink / raw)
To: ipfire-scm
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 0d8071449430e608ccf9586f844ec8c02f2b5c6d (commit)
via df977a4205a62bb2d5d198a9eec82d56ab50455a (commit)
from 94e2f9573905cb487c9e7dc1173de79d812f4c9e (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 0d8071449430e608ccf9586f844ec8c02f2b5c6d
Author: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue Jun 30 09:17:22 2026 +0200
core204: add kernel to updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
commit df977a4205a62bb2d5d198a9eec82d56ab50455a
Author: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue Jun 30 09:16:03 2026 +0200
kernel: update to 6.18.37
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.aarch64-ipfire | 5 +-
config/kernel/kernel.config.x86_64-ipfire | 2 +-
config/rootfiles/common/aarch64/linux | 12 +++
config/rootfiles/common/x86_64/linux | 10 +++
.../124 => core/204}/filelists/aarch64/linux | 0
.../181 => core/204}/filelists/riscv64/linux | 0
.../100 => core/204}/filelists/x86_64/linux | 0
config/rootfiles/core/204/update.sh | 90 ++++++++++++++++++++--
lfs/linux | 4 +-
9 files changed, 113 insertions(+), 10 deletions(-)
copy config/rootfiles/{oldcore/124 => core/204}/filelists/aarch64/linux (100%)
copy config/rootfiles/{oldcore/181 => core/204}/filelists/riscv64/linux (100%)
copy config/rootfiles/{oldcore/100 => core/204}/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 ec8dd55425..8ca74c118e 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.18.28 Kernel Configuration
+# Linux/arm64 6.18.36 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.2.0"
CONFIG_CC_IS_GCC=y
@@ -429,6 +429,7 @@ CONFIG_ARM64_ERRATUM_2966298=y
CONFIG_ARM64_ERRATUM_3117295=y
CONFIG_ARM64_ERRATUM_3194386=y
CONFIG_ARM64_ERRATUM_4193714=y
+CONFIG_ARM64_ERRATUM_4118414=y
CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23144=y
CONFIG_CAVIUM_ERRATUM_23154=y
@@ -2891,7 +2892,7 @@ CONFIG_FSL_DPAA_ETH=m
CONFIG_FSL_DPAA2_ETH=m
# CONFIG_FSL_DPAA2_ETH_DCB is not set
CONFIG_FSL_DPAA2_PTP_CLOCK=m
-CONFIG_FSL_DPAA2_SWITCH=y
+CONFIG_FSL_DPAA2_SWITCH=m
CONFIG_FSL_ENETC_CORE=m
CONFIG_NXP_ENETC_PF_COMMON=m
CONFIG_NXP_NETC_LIB=m
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 36345ca470..ac51d65849 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.18.32 Kernel Configuration
+# Linux/x86 6.18.37 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index 334bcc44c1..9a867e1a44 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -1341,6 +1341,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/arch/arm64/include/asm/ptdump.h
#lib/modules/KVER/build/arch/arm64/include/asm/ptrace.h
#lib/modules/KVER/build/arch/arm64/include/asm/pvclock-abi.h
+#lib/modules/KVER/build/arch/arm64/include/asm/ring_buffer.h
#lib/modules/KVER/build/arch/arm64/include/asm/rqspinlock.h
#lib/modules/KVER/build/arch/arm64/include/asm/rsi.h
#lib/modules/KVER/build/arch/arm64/include/asm/rsi_cmds.h
@@ -7718,6 +7719,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/asm-generic/qspinlock.h
#lib/modules/KVER/build/include/asm-generic/qspinlock_types.h
#lib/modules/KVER/build/include/asm-generic/resource.h
+#lib/modules/KVER/build/include/asm-generic/ring_buffer.h
#lib/modules/KVER/build/include/asm-generic/rqspinlock.h
#lib/modules/KVER/build/include/asm-generic/runtime-const.h
#lib/modules/KVER/build/include/asm-generic/rwonce.h
@@ -8000,6 +8002,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_4118414
#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
@@ -13268,6 +13271,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/drm/drm_util.h
#lib/modules/KVER/build/include/drm/drm_utils.h
#lib/modules/KVER/build/include/drm/drm_vblank.h
+#lib/modules/KVER/build/include/drm/drm_vblank_helper.h
#lib/modules/KVER/build/include/drm/drm_vblank_work.h
#lib/modules/KVER/build/include/drm/drm_vma_manager.h
#lib/modules/KVER/build/include/drm/drm_writeback.h
@@ -15254,6 +15258,11 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/linux/icmpv6.h
#lib/modules/KVER/build/include/linux/idle_inject.h
#lib/modules/KVER/build/include/linux/idr.h
+#lib/modules/KVER/build/include/linux/ieee80211-eht.h
+#lib/modules/KVER/build/include/linux/ieee80211-he.h
+#lib/modules/KVER/build/include/linux/ieee80211-ht.h
+#lib/modules/KVER/build/include/linux/ieee80211-mesh.h
+#lib/modules/KVER/build/include/linux/ieee80211-vht.h
#lib/modules/KVER/build/include/linux/ieee80211.h
#lib/modules/KVER/build/include/linux/ieee802154.h
#lib/modules/KVER/build/include/linux/if_arp.h
@@ -17197,6 +17206,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/linux/trace.h
#lib/modules/KVER/build/include/linux/trace_clock.h
#lib/modules/KVER/build/include/linux/trace_events.h
+#lib/modules/KVER/build/include/linux/trace_printk.h
#lib/modules/KVER/build/include/linux/trace_recursion.h
#lib/modules/KVER/build/include/linux/trace_seq.h
#lib/modules/KVER/build/include/linux/tracefs.h
@@ -17970,6 +17980,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/rdma/ib_verbs.h
#lib/modules/KVER/build/include/rdma/iba.h
#lib/modules/KVER/build/include/rdma/ibta_vol1_c12.h
+#lib/modules/KVER/build/include/rdma/iter.h
#lib/modules/KVER/build/include/rdma/iw_cm.h
#lib/modules/KVER/build/include/rdma/iw_portmap.h
#lib/modules/KVER/build/include/rdma/lag.h
@@ -23722,6 +23733,7 @@ lib/modules/KVER/kernel
#lib/modules/KVER/kernel/drivers/net/ethernet/freescale/dpaa2
#lib/modules/KVER/kernel/drivers/net/ethernet/freescale/dpaa2/fsl-dpaa2-eth.ko.xz
#lib/modules/KVER/kernel/drivers/net/ethernet/freescale/dpaa2/fsl-dpaa2-ptp.ko.xz
+#lib/modules/KVER/kernel/drivers/net/ethernet/freescale/dpaa2/fsl-dpaa2-switch.ko.xz
#lib/modules/KVER/kernel/drivers/net/ethernet/freescale/enetc
#lib/modules/KVER/kernel/drivers/net/ethernet/freescale/enetc/fsl-enetc-core.ko.xz
#lib/modules/KVER/kernel/drivers/net/ethernet/freescale/enetc/fsl-enetc-ptp.ko.xz
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index ccc8252197..486d53f0a3 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -1766,6 +1766,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/arch/x86/include/generated/asm/mmzone.h
#lib/modules/KVER/build/arch/x86/include/generated/asm/module.lds.h
#lib/modules/KVER/build/arch/x86/include/generated/asm/orc_hash.h
+#lib/modules/KVER/build/arch/x86/include/generated/asm/ring_buffer.h
#lib/modules/KVER/build/arch/x86/include/generated/asm/rwonce.h
#lib/modules/KVER/build/arch/x86/include/generated/asm/syscalls_32.h
#lib/modules/KVER/build/arch/x86/include/generated/asm/syscalls_64.h
@@ -7178,6 +7179,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/asm-generic/qspinlock.h
#lib/modules/KVER/build/include/asm-generic/qspinlock_types.h
#lib/modules/KVER/build/include/asm-generic/resource.h
+#lib/modules/KVER/build/include/asm-generic/ring_buffer.h
#lib/modules/KVER/build/include/asm-generic/rqspinlock.h
#lib/modules/KVER/build/include/asm-generic/runtime-const.h
#lib/modules/KVER/build/include/asm-generic/rwonce.h
@@ -12771,6 +12773,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/drm/drm_util.h
#lib/modules/KVER/build/include/drm/drm_utils.h
#lib/modules/KVER/build/include/drm/drm_vblank.h
+#lib/modules/KVER/build/include/drm/drm_vblank_helper.h
#lib/modules/KVER/build/include/drm/drm_vblank_work.h
#lib/modules/KVER/build/include/drm/drm_vma_manager.h
#lib/modules/KVER/build/include/drm/drm_writeback.h
@@ -14756,6 +14759,11 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/linux/icmpv6.h
#lib/modules/KVER/build/include/linux/idle_inject.h
#lib/modules/KVER/build/include/linux/idr.h
+#lib/modules/KVER/build/include/linux/ieee80211-eht.h
+#lib/modules/KVER/build/include/linux/ieee80211-he.h
+#lib/modules/KVER/build/include/linux/ieee80211-ht.h
+#lib/modules/KVER/build/include/linux/ieee80211-mesh.h
+#lib/modules/KVER/build/include/linux/ieee80211-vht.h
#lib/modules/KVER/build/include/linux/ieee80211.h
#lib/modules/KVER/build/include/linux/ieee802154.h
#lib/modules/KVER/build/include/linux/if_arp.h
@@ -16699,6 +16707,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/linux/trace.h
#lib/modules/KVER/build/include/linux/trace_clock.h
#lib/modules/KVER/build/include/linux/trace_events.h
+#lib/modules/KVER/build/include/linux/trace_printk.h
#lib/modules/KVER/build/include/linux/trace_recursion.h
#lib/modules/KVER/build/include/linux/trace_seq.h
#lib/modules/KVER/build/include/linux/tracefs.h
@@ -17472,6 +17481,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/rdma/ib_verbs.h
#lib/modules/KVER/build/include/rdma/iba.h
#lib/modules/KVER/build/include/rdma/ibta_vol1_c12.h
+#lib/modules/KVER/build/include/rdma/iter.h
#lib/modules/KVER/build/include/rdma/iw_cm.h
#lib/modules/KVER/build/include/rdma/iw_portmap.h
#lib/modules/KVER/build/include/rdma/lag.h
diff --git a/config/rootfiles/core/204/filelists/aarch64/linux b/config/rootfiles/core/204/filelists/aarch64/linux
new file mode 120000
index 0000000000..3a2532bc7d
--- /dev/null
+++ b/config/rootfiles/core/204/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/204/filelists/riscv64/linux b/config/rootfiles/core/204/filelists/riscv64/linux
new file mode 120000
index 0000000000..c8e8350ca6
--- /dev/null
+++ b/config/rootfiles/core/204/filelists/riscv64/linux
@@ -0,0 +1 @@
+../../../../common/riscv64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/204/filelists/x86_64/linux b/config/rootfiles/core/204/filelists/x86_64/linux
new file mode 120000
index 0000000000..0615b5b9ad
--- /dev/null
+++ b/config/rootfiles/core/204/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/204/update.sh b/config/rootfiles/core/204/update.sh
index 0629c154e8..fb55e4e929 100644
--- a/config/rootfiles/core/204/update.sh
+++ b/config/rootfiles/core/204/update.sh
@@ -26,15 +26,74 @@
core=204
+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
+
# Stop services
/etc/init.d/apache stop
+# 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 files
+rm -vf \
+ /usr/sbin/klogd \
+ /usr/lib/perl5/site_perl/5.36.0/Net/IPv4Addr.pm \
+ /usr/lib/perl5/site_perl/5.36.0/auto/Net/IPv4Addr/autosplit.ix
+
# Extract files
extract_files
@@ -42,6 +101,7 @@ extract_files
# update linker config
ldconfig
+
# Update Language cache
/usr/local/bin/update-lang-cache
@@ -54,6 +114,31 @@ ldconfig
# Start services
/etc/init.d/apache start
+# If 'monit' is installed: update '/etc/monitrc' for use with 'monit v6.0.0'
+if [ -e /etc/monitrc ]; then
+ sed -i -e "s/^set logfile/set log/g" /etc/monitrc
+fi
+
+# 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
@@ -66,11 +151,6 @@ if [ -e /boot/grub/grub.cfg ]; then
/usr/bin/install-bootloader
fi
-# If 'monit' is installed: update '/etc/monitrc' for use with 'monit v6.0.0'
-if [ -e /etc/monitrc ]; then
- sed -i -e "s/^set logfile/set log/g" /etc/monitrc
-fi
-
sync
# Don't report the exitcode last command
diff --git a/lfs/linux b/lfs/linux
index 0ece11f46d..833bbedf7e 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
include Config
-VER = 6.18.32
+VER = 6.18.37
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -69,7 +69,7 @@ objects = \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f292fd58cf61b23dbe40e4a1124d2e310712b2b3826195f348b9c5ab7773de9b4eed48e9abc524c5c2d5a05adab13fd305bab7ebfa0a829217e265ff4cdc69f5
+$(DL_FILE)_BLAKE2 = 70ecccd0199404a1190a8a5698bc84234681d8399084d2aa457d327a2849d03883659da85014fd5f593670ff6a6ac47ba6cb84bab74ba47de5b3fe28ced97b4a
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-30 7:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-30 7:17 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0d8071449430e608ccf9586f844ec8c02f2b5c6d Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox