* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5c548191d022319e90707b312d76b4506e5e6420
@ 2025-10-15 6:00 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2025-10-15 6:00 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 5c548191d022319e90707b312d76b4506e5e6420 (commit)
via 76fb0ec6772ecd7a71dca4a13479b96195abcea6 (commit)
via 2a3c757c1a4cfb94f460e9fc49ef9a5ce2d37a64 (commit)
from ed642520e68e73c8a72cce05728b5615f813ae79 (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 5c548191d022319e90707b312d76b4506e5e6420
Author: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed Oct 15 08:00:25 2025 +0200
core199: add kernel to updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
commit 76fb0ec6772ecd7a71dca4a13479b96195abcea6
Author: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed Oct 15 07:48:24 2025 +0200
kernel: update to 6.12.52
todo: config/rootfiles for arm and riscv
for this i need a nightly build log
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
commit 2a3c757c1a4cfb94f460e9fc49ef9a5ce2d37a64
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Sep 25 17:56:33 2025 +0000
kernel: Disable preemption debugging
From the kernel configuration:
If you say Y here then the kernel will use a debug variant of the
commonly used smp_processor_id() function and will print warnings
if kernel code uses it in a preemption-unsafe way. Also, the kernel
will detect preemption count underflows.
This option has potential to introduce high runtime overhead,
depending on workload as it triggers debugging routines for each
this_cpu operation. It should only be used for debugging purposes.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.aarch64-ipfire | 2 +-
config/kernel/kernel.config.x86_64-ipfire | 15 +++--
config/rootfiles/common/x86_64/linux | 5 +-
.../124 => core/199}/filelists/aarch64/linux | 0
.../181 => core/199}/filelists/riscv64/linux | 0
.../100 => core/199}/filelists/x86_64/linux | 0
config/rootfiles/core/199/update.sh | 67 +++++++++++++++++++++-
lfs/linux | 4 +-
8 files changed, 81 insertions(+), 12 deletions(-)
copy config/rootfiles/{oldcore/124 => core/199}/filelists/aarch64/linux (100%)
copy config/rootfiles/{oldcore/181 => core/199}/filelists/riscv64/linux (100%)
copy config/rootfiles/{oldcore/100 => core/199}/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 775b23d8e..820647d5f 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -9096,7 +9096,7 @@ CONFIG_SCHED_INFO=y
CONFIG_SCHEDSTATS=y
# end of Scheduler Debugging
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
#
# Lock Debugging (spinlocks, mutexes, etc...)
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 2ffc8bba1..628570488 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.12.41 Kernel Configuration
+# Linux/x86 6.12.52 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.1.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.2.0"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=150100
+CONFIG_GCC_VERSION=150200
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24400
+CONFIG_AS_VERSION=24500
CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24400
+CONFIG_LD_VERSION=24500
CONFIG_LLD_VERSION=0
CONFIG_RUSTC_VERSION=108300
CONFIG_RUSTC_LLVM_VERSION=190101
@@ -543,6 +543,7 @@ CONFIG_MITIGATION_SRBDS=y
CONFIG_MITIGATION_SSB=y
CONFIG_MITIGATION_ITS=y
CONFIG_MITIGATION_TSA=y
+CONFIG_MITIGATION_VMSCAPE=y
CONFIG_ARCH_HAS_ADD_PAGES=y
#
@@ -5451,6 +5452,7 @@ CONFIG_DRM=y
CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=y
+CONFIG_DRM_DRAW=y
CONFIG_DRM_PANIC=y
CONFIG_DRM_PANIC_FOREGROUND_COLOR=0xffffff
CONFIG_DRM_PANIC_BACKGROUND_COLOR=0x000000
@@ -6747,6 +6749,7 @@ CONFIG_VHOST_MENU=y
CONFIG_VHOST_NET=m
# CONFIG_VHOST_VSOCK is not set
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
#
# Microsoft Hyper-V guest support
@@ -8173,7 +8176,7 @@ CONFIG_SCHED_INFO=y
CONFIG_SCHEDSTATS=y
# end of Scheduler Debugging
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
#
# Lock Debugging (spinlocks, mutexes, etc...)
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index 66484034d..2ea3634ff 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -7877,7 +7877,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/config/DEBUG_KERNEL
#lib/modules/KVER/build/include/config/DEBUG_LIST
#lib/modules/KVER/build/include/config/DEBUG_MISC
-#lib/modules/KVER/build/include/config/DEBUG_PREEMPT
#lib/modules/KVER/build/include/config/DEBUG_WX
#lib/modules/KVER/build/include/config/DECOMPRESS_BZIP2
#lib/modules/KVER/build/include/config/DECOMPRESS_GZIP
@@ -7986,6 +7985,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/config/DRM_DISPLAY_HDCP_HELPER
#lib/modules/KVER/build/include/config/DRM_DISPLAY_HDMI_HELPER
#lib/modules/KVER/build/include/config/DRM_DISPLAY_HELPER
+#lib/modules/KVER/build/include/config/DRM_DRAW
#lib/modules/KVER/build/include/config/DRM_ETNAVIV
#lib/modules/KVER/build/include/config/DRM_ETNAVIV_THERMAL
#lib/modules/KVER/build/include/config/DRM_EXEC
@@ -9493,6 +9493,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/config/MITIGATION_TAA
#lib/modules/KVER/build/include/config/MITIGATION_TSA
#lib/modules/KVER/build/include/config/MITIGATION_UNRET_ENTRY
+#lib/modules/KVER/build/include/config/MITIGATION_VMSCAPE
#lib/modules/KVER/build/include/config/MLX4_CORE
#lib/modules/KVER/build/include/config/MLX4_CORE_GEN2
#lib/modules/KVER/build/include/config/MLX4_EN
@@ -11821,6 +11822,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/config/VGA_CONSOLE
#lib/modules/KVER/build/include/config/VGA_SWITCHEROO
#lib/modules/KVER/build/include/config/VHOST
+#lib/modules/KVER/build/include/config/VHOST_ENABLE_FORK_OWNER_CONTROL
#lib/modules/KVER/build/include/config/VHOST_IOTLB
#lib/modules/KVER/build/include/config/VHOST_MENU
#lib/modules/KVER/build/include/config/VHOST_NET
@@ -15236,6 +15238,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER/build/include/linux/personality.h
#lib/modules/KVER/build/include/linux/pfn.h
#lib/modules/KVER/build/include/linux/pfn_t.h
+#lib/modules/KVER/build/include/linux/pgalloc.h
#lib/modules/KVER/build/include/linux/pgalloc_tag.h
#lib/modules/KVER/build/include/linux/pgtable.h
#lib/modules/KVER/build/include/linux/pgtable_api.h
diff --git a/config/rootfiles/core/199/filelists/aarch64/linux b/config/rootfiles/core/199/filelists/aarch64/linux
new file mode 120000
index 000000000..3a2532bc7
--- /dev/null
+++ b/config/rootfiles/core/199/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/199/filelists/riscv64/linux b/config/rootfiles/core/199/filelists/riscv64/linux
new file mode 120000
index 000000000..c8e8350ca
--- /dev/null
+++ b/config/rootfiles/core/199/filelists/riscv64/linux
@@ -0,0 +1 @@
+../../../../common/riscv64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/199/filelists/x86_64/linux b/config/rootfiles/core/199/filelists/x86_64/linux
new file mode 120000
index 000000000..0615b5b9a
--- /dev/null
+++ b/config/rootfiles/core/199/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/199/update.sh b/config/rootfiles/core/199/update.sh
index d71190cc1..660bd2481 100644
--- a/config/rootfiles/core/199/update.sh
+++ b/config/rootfiles/core/199/update.sh
@@ -26,11 +26,64 @@
core=199
+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
+
+
# Stop services
# Remove files
@@ -59,7 +112,7 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi
/etc/init.d/unbound restart
/etc/init.d/sshd restart
-# Build initial ramdisks (for dracut-ng update)
+# Build initial ramdisks
dracut --regenerate-all --force
KVER="xxxKVERxxx"
case "$(uname -m)" in
@@ -69,8 +122,18 @@ case "$(uname -m)" in
;;
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
+touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start
diff --git a/lfs/linux b/lfs/linux
index 118a0fcf2..4f4319741 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
include Config
-VER = 6.12.41
+VER = 6.12.52
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -69,7 +69,7 @@ objects = \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 397efcded0f4adec48820e6c97685ce58bbe213cfb0355e36b096a1fad88f108eeee6ee3ce460cadc3b543252ed115c3b6dd4d27fb533dad8fd6a7a2ae53b338
+$(DL_FILE)_BLAKE2 = d3dddd1e92399770312bd831fd1540d0bc4f589d040ed1672a26b6705193bf68bd1897cf5fb67dbb1450959ea221468c12e7bfea7ecefc400404c968b1e498b9
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:[~2025-10-15 6:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-15 6:00 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5c548191d022319e90707b312d76b4506e5e6420 Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox