From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZSHLg3HJ2z32wj for ; Wed, 2 Apr 2025 07:58:51 +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 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZSHLg2zxLz2xSL for ; Wed, 2 Apr 2025 07:58:51 +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 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZSHLf4qcQzjj for ; Wed, 2 Apr 2025 07:58:50 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1743580730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=UrSV08siUtkg4oNGwihf6HtGr8Fj72uBm1yE5ITIBLE=; b=L6o8DKEzEhATOqINz5ZJwHLERINtajXw/ymofkJlQwftEh+t7PCXuTXUAToxCRnHzcATjJ 13bGmiOpt141HJAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1743580730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=UrSV08siUtkg4oNGwihf6HtGr8Fj72uBm1yE5ITIBLE=; b=U47I4djWa5SqZhl9cbewiGFiprmxfCzcI0dIzvwgtmKi9fKrfqFHmhuYnI/BLCAQAhgRfF Eau4Q+04hOE29iCc3W0JF+rMwQYrUYYk9FZGKvf33D6PptA8i1RFiZJknRmvFb3/y4DIB+ VkdxfNENcjlUoRMpoDfHwbOImGfVbkFTrRKAiY42us3Nq7d/f3kD53ueOJ4iGkPBSLjng5 KPmRs0YlDD0QGnWz6EkgG4LFEhSU4KvmHsz4DkxI7F3QnVdE9yNpwOxh/LDek4ehIZJxJl PWnYhsdIA5WZa/dXPSMpO75q3w1GhUdwqEg3P2X79ZHzumE0f1260Cgq5deb9Q== Received: by people01.haj.ipfire.org (Postfix, from userid 1001) id 4ZSHLf3YCVz2xwB; Wed, 2 Apr 2025 07:58:50 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ee3ce2371504df0e14b6cb19437d5290f38a6f1 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 899c06d767943eea338ba9bbb47dde6576ae9279 X-Git-Newrev: 7ee3ce2371504df0e14b6cb19437d5290f38a6f1 Message-Id: <4ZSHLf3YCVz2xwB@people01.haj.ipfire.org> Date: Wed, 2 Apr 2025 07:58:50 +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 7ee3ce2371504df0e14b6cb19437d5290f38a6f1 (commit) via a4726d9aff6374f1efe95d67a283988d41e6f79d (commit) via b9a677a20b3b9e65e2d8976649574af00f318ecc (commit) via b3818cfc11a611d465e04b63bad852d219ee9ca0 (commit) from 899c06d767943eea338ba9bbb47dde6576ae9279 (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 7ee3ce2371504df0e14b6cb19437d5290f38a6f1 Author: Arne Fitzenreiter Date: Wed Apr 2 09:58:27 2025 +0200 core194: add kernel to update Signed-off-by: Arne Fitzenreiter commit a4726d9aff6374f1efe95d67a283988d41e6f79d Author: Arne Fitzenreiter Date: Wed Apr 2 09:44:24 2025 +0200 kernel: update to 6.12.21 MD_LINEAR (JBOD) is now back in the mainline kernel Signed-off-by: Arne Fitzenreiter commit b9a677a20b3b9e65e2d8976649574af00f318ecc Author: Arne Fitzenreiter Date: Wed Apr 2 09:43:49 2025 +0200 mympd: update to 20.1.0 Signed-off-by: Arne Fitzenreiter commit b3818cfc11a611d465e04b63bad852d219ee9ca0 Author: Arne Fitzenreiter Date: Wed Apr 2 09:42:41 2025 +0200 ovmf: update to 2025.02-1 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 9 +-- config/kernel/kernel.config.riscv64-ipfire | 1 + config/kernel/kernel.config.x86_64-ipfire | 13 ++-- config/rootfiles/common/aarch64/linux | 8 ++- config/rootfiles/common/x86_64/linux | 10 ++- .../124 => core/194}/filelists/aarch64/linux | 0 .../181 => core/194}/filelists/riscv64/linux | 0 .../100 => core/194}/filelists/x86_64/linux | 0 config/rootfiles/core/194/update.sh | 74 +++++++++++++++++++++- lfs/linux | 4 +- lfs/mympd | 6 +- lfs/ovmf | 6 +- 12 files changed, 106 insertions(+), 25 deletions(-) copy config/rootfiles/{oldcore/124 => core/194}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/181 => core/194}/filelists/riscv64/linux (100%) copy config/rootfiles/{oldcore/100 => core/194}/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 c0cd6894d7..ed0782ec90 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.13 Kernel Configuration +# Linux/arm64 6.12.21 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24300 +CONFIG_AS_VERSION=24400 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24300 +CONFIG_LD_VERSION=24400 CONFIG_LLD_VERSION=0 CONFIG_RUSTC_VERSION=108300 CONFIG_RUSTC_LLVM_VERSION=190101 @@ -2521,6 +2521,7 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y +CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m @@ -2670,6 +2671,7 @@ CONFIG_NET_DSA_REALTEK_MDIO=y CONFIG_NET_DSA_REALTEK_SMI=y CONFIG_NET_DSA_REALTEK_RTL8365MB=m CONFIG_NET_DSA_REALTEK_RTL8366RB=m +CONFIG_NET_DSA_REALTEK_RTL8366RB_LEDS=y CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m @@ -7827,7 +7829,6 @@ CONFIG_IRQ_MSI_LIB=y # CONFIG_AL_FIC is not set CONFIG_BRCMSTB_L2_IRQ=y CONFIG_DW_APB_ICTL=y -CONFIG_LAN966X_OIC=m CONFIG_SUN6I_R_INTC=y CONFIG_SUNXI_NMI_INTC=y # CONFIG_XILINX_INTC is not set diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index 1f5c82cf01..c75ddb7210 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -2252,6 +2252,7 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y +CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index eb24bfac07..03a9d98178 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.13 Kernel Configuration +# Linux/x86 6.12.21 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24300 +CONFIG_AS_VERSION=24400 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24300 +CONFIG_LD_VERSION=24400 CONFIG_LLD_VERSION=0 CONFIG_RUSTC_VERSION=108300 CONFIG_RUSTC_LLVM_VERSION=190101 @@ -70,7 +70,6 @@ CONFIG_GENERIC_PENDING_IRQ=y CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_GENERIC_IRQ_INJECTION=y CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_SIM=y CONFIG_IRQ_DOMAIN_HIERARCHY=y @@ -2082,7 +2081,6 @@ CONFIG_EFI_EARLYCON=y CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y -# CONFIG_IMX_SCMI_MISC_DRV is not set # # Qualcomm firmware drivers @@ -2496,6 +2494,7 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y +CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m @@ -5429,6 +5428,8 @@ CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_PANIC is not set # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set +CONFIG_DRM_CLIENT_SELECTION=y +CONFIG_DRM_CLIENT_SETUP=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set @@ -6796,7 +6797,6 @@ CONFIG_LTE_GDM724X=m # CONFIG_VME_BUS is not set # CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set -# CONFIG_CZNIC_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_SURFACE_PLATFORMS=y # CONFIG_SURFACE_3_POWER_OPREGION is not set @@ -7108,7 +7108,6 @@ CONFIG_MEMORY=y # # IRQ chip support # -CONFIG_LAN966X_OIC=m CONFIG_MADERA_IRQ=m # end of IRQ chip support diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index dd1278c001..ca6847ca24 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -9542,7 +9542,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/L2TP_IP #lib/modules/KVER/build/include/config/L2TP_V3 #lib/modules/KVER/build/include/config/LAN743X -#lib/modules/KVER/build/include/config/LAN966X_OIC #lib/modules/KVER/build/include/config/LAN966X_SWITCH #lib/modules/KVER/build/include/config/LCD_CLASS_DEVICE #lib/modules/KVER/build/include/config/LCD_PLATFORM @@ -9680,6 +9679,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/MDIO_SUN4I #lib/modules/KVER/build/include/config/MD_AUTODETECT #lib/modules/KVER/build/include/config/MD_BITMAP_FILE +#lib/modules/KVER/build/include/config/MD_LINEAR #lib/modules/KVER/build/include/config/MD_RAID0 #lib/modules/KVER/build/include/config/MD_RAID1 #lib/modules/KVER/build/include/config/MD_RAID10 @@ -10139,6 +10139,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/NET_DSA_REALTEK_MDIO #lib/modules/KVER/build/include/config/NET_DSA_REALTEK_RTL8365MB #lib/modules/KVER/build/include/config/NET_DSA_REALTEK_RTL8366RB +#lib/modules/KVER/build/include/config/NET_DSA_REALTEK_RTL8366RB_LEDS #lib/modules/KVER/build/include/config/NET_DSA_REALTEK_SMI #lib/modules/KVER/build/include/config/NET_DSA_SMSC_LAN9303 #lib/modules/KVER/build/include/config/NET_DSA_SMSC_LAN9303_I2C @@ -12441,6 +12442,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/drm/drm_buddy.h #lib/modules/KVER/build/include/drm/drm_cache.h #lib/modules/KVER/build/include/drm/drm_client.h +#lib/modules/KVER/build/include/drm/drm_client_setup.h #lib/modules/KVER/build/include/drm/drm_color_mgmt.h #lib/modules/KVER/build/include/drm/drm_connector.h #lib/modules/KVER/build/include/drm/drm_crtc.h @@ -12457,6 +12459,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/drm/drm_exec.h #lib/modules/KVER/build/include/drm/drm_fb_dma_helper.h #lib/modules/KVER/build/include/drm/drm_fb_helper.h +#lib/modules/KVER/build/include/drm/drm_fbdev_client.h #lib/modules/KVER/build/include/drm/drm_fbdev_dma.h #lib/modules/KVER/build/include/drm/drm_fbdev_shmem.h #lib/modules/KVER/build/include/drm/drm_fbdev_ttm.h @@ -13789,6 +13792,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/cache.h #lib/modules/KVER/build/include/linux/cacheflush.h #lib/modules/KVER/build/include/linux/cacheinfo.h +#lib/modules/KVER/build/include/linux/call_once.h #lib/modules/KVER/build/include/linux/can #lib/modules/KVER/build/include/linux/can/bittiming.h #lib/modules/KVER/build/include/linux/can/can-ml.h @@ -21479,7 +21483,6 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/input/sparse-keymap.ko.xz #lib/modules/KVER/kernel/drivers/irqchip #lib/modules/KVER/kernel/drivers/irqchip/irq-imx-mu-msi.ko.xz -#lib/modules/KVER/kernel/drivers/irqchip/irq-lan966x-oic.ko.xz #lib/modules/KVER/kernel/drivers/leds #lib/modules/KVER/kernel/drivers/leds/leds-bd2802.ko.xz #lib/modules/KVER/kernel/drivers/leds/leds-blinkm.ko.xz @@ -21528,6 +21531,7 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/md/dm-vdo/dm-vdo.ko.xz #lib/modules/KVER/kernel/drivers/md/dm-writecache.ko.xz #lib/modules/KVER/kernel/drivers/md/dm-zero.ko.xz +#lib/modules/KVER/kernel/drivers/md/linear.ko.xz #lib/modules/KVER/kernel/drivers/md/persistent-data #lib/modules/KVER/kernel/drivers/md/persistent-data/dm-persistent-data.ko.xz #lib/modules/KVER/kernel/drivers/md/raid0.ko.xz diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index cfb63f24bb..845f28b519 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -7965,6 +7965,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/DRM_BRIDGE #lib/modules/KVER/build/include/config/DRM_BUDDY #lib/modules/KVER/build/include/config/DRM_CIRRUS_QEMU +#lib/modules/KVER/build/include/config/DRM_CLIENT_SELECTION +#lib/modules/KVER/build/include/config/DRM_CLIENT_SETUP #lib/modules/KVER/build/include/config/DRM_DISPLAY_DP_HELPER #lib/modules/KVER/build/include/config/DRM_DISPLAY_HDCP_HELPER #lib/modules/KVER/build/include/config/DRM_DISPLAY_HDMI_HELPER @@ -8461,7 +8463,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/GENERIC_ENTRY #lib/modules/KVER/build/include/config/GENERIC_GETTIMEOFDAY #lib/modules/KVER/build/include/config/GENERIC_IOMAP -#lib/modules/KVER/build/include/config/GENERIC_IRQ_CHIP #lib/modules/KVER/build/include/config/GENERIC_IRQ_EFFECTIVE_AFF_MASK #lib/modules/KVER/build/include/config/GENERIC_IRQ_INJECTION #lib/modules/KVER/build/include/config/GENERIC_IRQ_MATRIX_ALLOCATOR @@ -9219,7 +9220,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/L2TP_IP #lib/modules/KVER/build/include/config/L2TP_V3 #lib/modules/KVER/build/include/config/LAN743X -#lib/modules/KVER/build/include/config/LAN966X_OIC #lib/modules/KVER/build/include/config/LCD_CLASS_DEVICE #lib/modules/KVER/build/include/config/LCD_PLATFORM #lib/modules/KVER/build/include/config/LDM_PARTITION @@ -9363,6 +9363,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/MDIO_THUNDER #lib/modules/KVER/build/include/config/MD_AUTODETECT #lib/modules/KVER/build/include/config/MD_BITMAP_FILE +#lib/modules/KVER/build/include/config/MD_LINEAR #lib/modules/KVER/build/include/config/MD_RAID0 #lib/modules/KVER/build/include/config/MD_RAID1 #lib/modules/KVER/build/include/config/MD_RAID10 @@ -12346,6 +12347,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/drm/drm_buddy.h #lib/modules/KVER/build/include/drm/drm_cache.h #lib/modules/KVER/build/include/drm/drm_client.h +#lib/modules/KVER/build/include/drm/drm_client_setup.h #lib/modules/KVER/build/include/drm/drm_color_mgmt.h #lib/modules/KVER/build/include/drm/drm_connector.h #lib/modules/KVER/build/include/drm/drm_crtc.h @@ -12362,6 +12364,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/drm/drm_exec.h #lib/modules/KVER/build/include/drm/drm_fb_dma_helper.h #lib/modules/KVER/build/include/drm/drm_fb_helper.h +#lib/modules/KVER/build/include/drm/drm_fbdev_client.h #lib/modules/KVER/build/include/drm/drm_fbdev_dma.h #lib/modules/KVER/build/include/drm/drm_fbdev_shmem.h #lib/modules/KVER/build/include/drm/drm_fbdev_ttm.h @@ -13693,6 +13696,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/cache.h #lib/modules/KVER/build/include/linux/cacheflush.h #lib/modules/KVER/build/include/linux/cacheinfo.h +#lib/modules/KVER/build/include/linux/call_once.h #lib/modules/KVER/build/include/linux/can #lib/modules/KVER/build/include/linux/can/bittiming.h #lib/modules/KVER/build/include/linux/can/can-ml.h @@ -21569,7 +21573,6 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/iommu #lib/modules/KVER/kernel/drivers/iommu/virtio-iommu.ko.xz #lib/modules/KVER/kernel/drivers/irqchip -#lib/modules/KVER/kernel/drivers/irqchip/irq-lan966x-oic.ko.xz #lib/modules/KVER/kernel/drivers/irqchip/irq-madera.ko.xz #lib/modules/KVER/kernel/drivers/leds #lib/modules/KVER/kernel/drivers/leds/leds-apu.ko.xz @@ -21626,6 +21629,7 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/md/dm-writecache.ko.xz #lib/modules/KVER/kernel/drivers/md/dm-zero.ko.xz #lib/modules/KVER/kernel/drivers/md/dm-zoned.ko.xz +#lib/modules/KVER/kernel/drivers/md/linear.ko.xz #lib/modules/KVER/kernel/drivers/md/persistent-data #lib/modules/KVER/kernel/drivers/md/persistent-data/dm-persistent-data.ko.xz #lib/modules/KVER/kernel/drivers/md/raid0.ko.xz diff --git a/config/rootfiles/core/194/filelists/aarch64/linux b/config/rootfiles/core/194/filelists/aarch64/linux new file mode 120000 index 0000000000..3a2532bc7d --- /dev/null +++ b/config/rootfiles/core/194/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/194/filelists/riscv64/linux b/config/rootfiles/core/194/filelists/riscv64/linux new file mode 120000 index 0000000000..c8e8350ca6 --- /dev/null +++ b/config/rootfiles/core/194/filelists/riscv64/linux @@ -0,0 +1 @@ +../../../../common/riscv64/linux \ No newline at end of file diff --git a/config/rootfiles/core/194/filelists/x86_64/linux b/config/rootfiles/core/194/filelists/x86_64/linux new file mode 120000 index 0000000000..0615b5b9ad --- /dev/null +++ b/config/rootfiles/core/194/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/194/update.sh b/config/rootfiles/core/194/update.sh index 6c72dbd545..e1e9dde9b3 100644 --- a/config/rootfiles/core/194/update.sh +++ b/config/rootfiles/core/194/update.sh @@ -26,6 +26,18 @@ core=194 +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 @@ -33,6 +45,46 @@ done # Stop services +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 files rm -vf \ /usr/bin/idn \ @@ -55,8 +107,28 @@ ldconfig /etc/init.d/ipsec restart /etc/init.d/suricata restart +# 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 +touch /var/run/need_reboot # Finish /etc/init.d/fireinfo start diff --git a/lfs/linux b/lfs/linux index a58257fba2..5317a49655 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.12.13 +VER = 6.12.21 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -69,7 +69,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 6c1f22d80bd5226a08c5ef80e9ab2ba553d00b49b4795b8ccb227381a7275ec89534267354318fa9b938fe99c4d91f0bf6b1d55263ea57eccc3aea1a9ce1d611 +$(DL_FILE)_BLAKE2 = 3dad715ed88f08c680837f7f74d0cb759f1a50f597820a9885863fba48cc13b10d4efa65ad821c02cfbbd7f0b814f4498cf15f4274cd9249b49edd5a37ea0728 install : $(TARGET) diff --git a/lfs/mympd b/lfs/mympd index 81e270fab8..fe3faf6e46 100644 --- a/lfs/mympd +++ b/lfs/mympd @@ -26,7 +26,7 @@ include Config SUMMARY = Webfrontend for Music Player Daemon -VER = 19.0.2 +VER = 20.1.0 THISAPP = myMPD-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mympd -PAK_VER = 10 +PAK_VER = 11 DEPS = mpd libmpdclient @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a3f6c5e46b3f69ac8f7d9fee9af4425533604b0de94d18990fdc6e08178191d489b1290496d68f6a975f01e6340a160368e0f5f617c861cc11cdf1d43a1a6435 +$(DL_FILE)_BLAKE2 = 690a9126f5e3bcad28cab2cb992d74b295578794028ec05f876bcee2efd49a91d9f22cb6c46a412802fce24d98c182cb27ea4174157f00e2a67e7d92555509be install : $(TARGET) diff --git a/lfs/ovmf b/lfs/ovmf index 097f391080..508313c6a7 100644 --- a/lfs/ovmf +++ b/lfs/ovmf @@ -26,14 +26,14 @@ include Config SUMMARY = Open Virtual Machine Firmware -VER = 2024.11-5 +VER = 2025.02-1 THISAPP = ovmf_$(VER) DL_FILE = $(THISAPP)_all.deb DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ovmf -PAK_VER = 1 +PAK_VER = 2 ############################################################################### # Top-level Rules @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 466692251a4da0a2140b27b7c07db1a754624c21605d0439a7d50d650e07297392df6982d9c065cc3f4ef0536ee5308235a43f78aba69e216250fb6469f33c98 +$(DL_FILE)_BLAKE2 = 4c4ea2b043407c409b8d075bbae70d5bcbc6285e811e6a7aefa58fa9e9c607bba5acf3f21adfb71f86516e1b49cef87296b62225d733ff5d46e685b8c0c6bca6 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree