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 4jVZ8y6ZpMz2xV5 for ; Thu, 19 Nov 2026 10:15:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "YR1" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4jVZ8y6NL8z2xKx for ; Thu, 19 Nov 2026 10:15:14 +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 "YE1" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4jVZ8y3JZ4z1YB for ; Thu, 19 Nov 2026 10:15:14 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1795083314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=GDMgvoyvR2feb/RrSqCxe8eamFXiK80gdP8B2hKPX+I=; b=QznnR/4Zk75WgKgfXuGYUudBDoLFaPO+NzzVTdRbwif1GYjp0Ulu8giqNncQQs3jLFD6ar ERtwUN7cS7LY6aAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1795083314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=GDMgvoyvR2feb/RrSqCxe8eamFXiK80gdP8B2hKPX+I=; b=iZEoFo7agoFKlxVlMwWeFzA6YYrIMDuNu+xHGxKss1Si/OZElITLfrvvNRlbinPqfHI39w PFF0u9RWeT0GRAJmci/84LlHEd42nqvDjrZvMl0HQRdbCERvKuUjT0TTMihC6xjuBK0eHg pBPmulkqQ338M8WjgkWY2TOAS2cQ3n/weGYXiCmVreIal7O9TTUcvdANhPrUHESAzqA9kM OCgYgIvJ5LIQBcZaOMat+NHfpn76EDJbzs4CBD6zfvi5w3kyZP8MOEP/CIdOu/1kPYKwGx jUnIkeBsF5m6LMXuuZm5bFhG/z6IP5VYF/lEHzAeyj7ewv66W41GLMLgKGV8NQ== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4jVZ8y2bpFz2xVM; Thu, 19 Nov 2026 10:15:14 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 146d6a8845ccb2da73d8b5701ccde94b45ced76c X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cd0a94f3daa66fa4190233af7bc83251fee08924 X-Git-Newrev: 146d6a8845ccb2da73d8b5701ccde94b45ced76c Message-Id: <4jVZ8y2bpFz2xVM@people01.haj.ipfire.org> Date: Thu, 19 Nov 2026 10:15:14 +0000 (UTC) From: Michael Tremer 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, master has been updated via 146d6a8845ccb2da73d8b5701ccde94b45ced76c (commit) from cd0a94f3daa66fa4190233af7bc83251fee08924 (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 146d6a8845ccb2da73d8b5701ccde94b45ced76c Author: Michael Tremer Date: Thu Nov 19 10:13:09 2026 +0000 core206: Ship the kernel in the updater The kernel has been updated since Core Update 205, but it was not part of the update. Add it to the file lists for all architectures and perform the usual sanity checks and cleanup of the old kernel in update.sh. Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: .../124 => core/206}/filelists/aarch64/linux | 0 .../rootfiles/core/206/filelists/loongarch64/linux | 1 + .../181 => core/206}/filelists/riscv64/linux | 0 .../100 => core/206}/filelists/x86_64/linux | 0 config/rootfiles/core/206/update.sh | 63 +++++++++++++++++++++- 5 files changed, 63 insertions(+), 1 deletion(-) copy config/rootfiles/{oldcore/124 => core/206}/filelists/aarch64/linux (100%) create mode 120000 config/rootfiles/core/206/filelists/loongarch64/linux copy config/rootfiles/{oldcore/181 => core/206}/filelists/riscv64/linux (100%) copy config/rootfiles/{oldcore/100 => core/206}/filelists/x86_64/linux (100%) Difference in files: diff --git a/config/rootfiles/core/206/filelists/aarch64/linux b/config/rootfiles/core/206/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/206/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/206/filelists/loongarch64/linux b/config/rootfiles/core/206/filelists/loongarch64/linux new file mode 120000 index 000000000..31b2bcffe --- /dev/null +++ b/config/rootfiles/core/206/filelists/loongarch64/linux @@ -0,0 +1 @@ +../../../../common/loongarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/206/filelists/riscv64/linux b/config/rootfiles/core/206/filelists/riscv64/linux new file mode 120000 index 000000000..c8e8350ca --- /dev/null +++ b/config/rootfiles/core/206/filelists/riscv64/linux @@ -0,0 +1 @@ +../../../../common/riscv64/linux \ No newline at end of file diff --git a/config/rootfiles/core/206/filelists/x86_64/linux b/config/rootfiles/core/206/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/206/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/206/update.sh b/config/rootfiles/core/206/update.sh index 454bcf620..8a5515d44 100644 --- a/config/rootfiles/core/206/update.sh +++ b/config/rootfiles/core/206/update.sh @@ -26,13 +26,65 @@ core=206 +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="@KERNEL_RELEASE@" + +# 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 +# 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 -rfv \ /etc/strongswan.d/charon/gcrypt.conf \ @@ -117,7 +169,6 @@ fi # Build initial ramdisks dracut --regenerate-all --force -KVER="@KERNEL_RELEASE@" case "$(uname -m)" in aarch64) mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}.img /boot/uInit-${KVER} @@ -128,6 +179,16 @@ esac # This update needs a reboot... touch /var/run/need_reboot +# Update 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 + # Finish /etc/init.d/fireinfo start sendprofile hooks/post-receive -- IPFire 2.x development tree