Update to 6.12.25 stable_20250428

Merge pull request 'Fixes to enable bootc' (#19 ) from metalefty/raspberrypi:a9-bootc into a9
Reviewed-on: rpms/raspberrypi2#19
2025-05-22 16:38:55 +09:00 · 2025-05-19 09:18:57 +00:00 · 2025-05-19 18:11:20 +09:00 · 2025-05-19 18:10:18 +09:00 · 2025-04-03 13:30:05 +09:00 · 2025-04-01 15:56:09 +09:00
3 changed files with 75 additions and 42 deletions
--- a/SOURCES/config_2711.patch
+++ b/SOURCES/config_2711.patch
@ -1,21 +1,21 @@
-From 8bdc23947dfc60f7c1e277dc4f87a8bc5fc645c6 Mon Sep 17 00:00:00 2001
+From bdec30ca8e18bc7d9a5d25d7cd9ca7976aef8aa2 Mon Sep 17 00:00:00 2001
 From: Koichiro Iwao <meta@almalinux.org>
-Date: Tue, 28 May 2024 15:11:20 +0900
+Date: Mon, 19 May 2025 13:09:29 +0900
 Subject: [PATCH 1/2] Apply config patch for Raspberry Pi (BCM2711)

 The patch is originally provided by Pablo Greco <pgreco@centosproject.org>.

 Signed-off-by: Koichiro Iwao <meta@almalinux.org>
 ---
- arch/arm64/configs/bcm2711_defconfig | 38 ++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
+ arch/arm64/configs/bcm2711_defconfig | 42 ++++++++++++++++++++++++++--
+ 1 file changed, 40 insertions(+), 2 deletions(-)

 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index e87791286ab4..6fda5b261683 100644
+index ce3e13572fb4..324800576e6a 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1622,8 +1622,6 @@ CONFIG_NLS_KOI8_U=m
- CONFIG_DLM=m
+@@ -1690,8 +1690,6 @@ CONFIG_DLM=m
+ CONFIG_UNICODE=m
 CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_SECURITY=y
 -CONFIG_SECURITY_APPARMOR=y
@ -23,7 +23,7 @@ index e87791286ab4..6fda5b261683 100644
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AES=m
-@@ -1674,3 +1672,39 @@ CONFIG_SCHED_TRACER=y
+@@ -1742,3 +1740,43 @@ CONFIG_SCHED_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_UPROBE_EVENTS is not set
 # CONFIG_STRICT_DEVMEM is not set
@ -63,6 +63,10 @@ index e87791286ab4..6fda5b261683 100644
 +CONFIG_FW_LOADER_COMPRESS=y
 +CONFIG_FW_LOADER_COMPRESS_XZ=y
 +CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
 -- 
-2.45.1
+2.49.0

--- a/SOURCES/config_2712.patch
+++ b/SOURCES/config_2712.patch
@ -1,21 +1,21 @@
-From 5ae1f73a82e6ba1203d031c5c82943865dce8174 Mon Sep 17 00:00:00 2001
+From c6064f14a8c32e3109ee83c736097e2ee03086ca Mon Sep 17 00:00:00 2001
 From: Koichiro Iwao <meta@almalinux.org>
-Date: Tue, 28 May 2024 15:14:02 +0900
+Date: Mon, 19 May 2025 13:10:35 +0900
 Subject: [PATCH 2/2] Apply config patch for Raspberry Pi (BCM2712)

 The patch is originally provided by Pablo Greco <pgreco@centosproject.org>.

 Signed-off-by: Koichiro Iwao <meta@almalinux.org>
 ---
- arch/arm64/configs/bcm2712_defconfig | 38 ++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
+ arch/arm64/configs/bcm2712_defconfig | 42 ++++++++++++++++++++++++++--
+ 1 file changed, 40 insertions(+), 2 deletions(-)

 diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig
-index 79c4332581eb..7b63683ff687 100644
+index 9e2bda050f81..51afa99f75e3 100644
 --- a/arch/arm64/configs/bcm2712_defconfig
 +++ b/arch/arm64/configs/bcm2712_defconfig
-@@ -1625,8 +1625,6 @@ CONFIG_NLS_KOI8_U=m
- CONFIG_DLM=m
+@@ -1692,8 +1692,6 @@ CONFIG_DLM=m
+ CONFIG_UNICODE=m
 CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_SECURITY=y
 -CONFIG_SECURITY_APPARMOR=y
@ -23,7 +23,7 @@ index 79c4332581eb..7b63683ff687 100644
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AES=m
-@@ -1677,3 +1675,39 @@ CONFIG_SCHED_TRACER=y
+@@ -1744,3 +1742,43 @@ CONFIG_SCHED_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_UPROBE_EVENTS is not set
 # CONFIG_STRICT_DEVMEM is not set
@ -63,6 +63,10 @@ index 79c4332581eb..7b63683ff687 100644
 +CONFIG_FW_LOADER_COMPRESS=y
 +CONFIG_FW_LOADER_COMPRESS_XZ=y
 +CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
 -- 
-2.45.1
+2.49.0

--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@ -1,5 +1,5 @@
-%global firmware_tag	1.20250127
-%global version_tag	20250127
+%global firmware_tag	1.20250430
+%global version_tag	20250428

 ExclusiveArch: aarch64

@ -18,8 +18,8 @@ ExclusiveArch: aarch64
 %define rpisuffix 2
 %define ksuffix 4

-%define kversion 6.6
-%define patchlevel 74
+%define kversion 6.12
+%define patchlevel 25

 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
@ -211,15 +211,15 @@ popd
 %if %{with_up}
 # kernel
 mkdir -p %{buildroot}/boot/overlays/
-mkdir -p %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+mkdir -p %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
 cp -p -v COPYING %{buildroot}/boot/COPYING.linux-%{kversion}
-cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
 %ifarch aarch64
-cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
 %else
-cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
 %endif
-cp -p -v arch/%{Arch}/boot/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+cp -p -v arch/%{Arch}/boot/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
 cp -p -v arch/%{Arch}/boot/%{build_image} %{buildroot}/boot/kernel-%{version}-%{release}.img
 make INSTALL_MOD_PATH=%{buildroot} modules_install
 cat > %{buildroot}/boot/config-kernel-%{version}-%{release}.inc <<__EOF__
@ -340,12 +340,12 @@ find %{buildroot}/usr/include \
 %files kernel%{?ksuffix}
 %defattr(-,root,root,-)
 /lib/modules/%{version}-%{release}
-/usr/share/%{name}-kernel/%{version}-%{release}
-/usr/share/%{name}-kernel/%{version}-%{release}/boot
-/usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb
 /boot/config-%{version}-%{release}
 /boot/overlays/
-/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*
 %attr(0755,root,root) /boot/kernel-%{version}-%{release}.img
 %ghost /boot/initramfs-%{version}-%{release}.img
 /boot/config-kernel-%{version}-%{release}.inc
@ -353,24 +353,39 @@ find %{buildroot}/usr/include \


 %posttrans kernel%{?ksuffix}
-if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
-    # if nothing exists, fall back to generating the file, but don't create it
-    # if we have moved to initramfs
-    cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
+if [ -d /usr/lib/ostree-boot ]; then
+  mkdir -p /usr/lib/modules/%{version}-%{release}
+  pushd /usr/lib/ostree-boot
+  [ -e config-%{version}-%{release} ] && \
+    mv config-%{version}-%{release} /usr/lib/modules/%{version}-%{release}/
+  [ -e config-kernel-%{version}-%{release}.inc ] && \
+    mv config-kernel-%{version}-%{release}.inc /usr/lib/modules/%{version}-%{release}/
+  [ -e initramfs-%{version}-%{release}.img ] && \ 
+    mv initramfs-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/initramfs
+  [ -e kernel-%{version}-%{release}.img ] && \
+    mv kernel-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/vmlinuz
+  popd
+fi
+if [ -d /boot ]; then
+  if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
+      # if nothing exists, fall back to generating the file, but don't create it
+      # if we have moved to initramfs
+      cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
+  fi
+  cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb /boot/
+  cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
+  cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/README /boot/overlays/
+  cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
 fi
-cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb /boot/
-cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
-cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/README /boot/overlays/
-cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc

 %postun kernel%{?ksuffix}
 if [ -f /boot/kernel%{armtarget}.img ];then
    #only restore kernel%{armtarget}.img if it exists, we may have moved to initramfs
    cp $(ls -1 /boot/kernel-*-*|sort -V|tail -1) /boot/kernel%{armtarget}.img
 fi
-cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/*.dtb /boot/
-cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/*.dtb* /boot/overlays/
-cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README /boot/overlays/
+cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/*.dtb /boot/
+cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/overlays/*.dtb* /boot/overlays/
+cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/overlays/README /boot/overlays/
 cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc


@ -430,6 +445,16 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 %endif

 %changelog
+* Wed May 21 2025 Koichiro Iwao <meta@almalinux.org> - 6.12.25-20250428.v8.1
+- Update kernel to 6.12.25 stable_20250428
+- Update firmware to 1.20250430
+- Regenerate patches
+
+* Mon Apr 14 2025 Koichiro Iwao <meta@almalinux.org> - 6.6.74-20250127.v8.2
+- Fixes to enable bootc
+- Enable EROFS
+- Use the consistent directory under /usr/share with the package name
+
 * Thu Feb 20 2025 Koichiro Iwao <meta@almalinux.org> - 6.6.74-20250127.v8.1
 - Update kernel to v6.6.74 stable_20250127
 - Update firmware to 1.20250127
Author	SHA1	Message	Date
Koichiro Iwao	02a0c2da1f	Update to 6.12.25 stable_20250428	2025-05-22 16:38:55 +09:00
Andrew Lukoshko	eebe4c438d	Merge pull request 'Fixes to enable bootc' (#19 ) from metalefty/raspberrypi:a9-bootc into a9 Reviewed-on: rpms/raspberrypi2#19	2025-05-19 09:18:57 +00:00
Koichiro Iwao	863a2f1858	Bump package version and update changelog	2025-05-19 18:11:20 +09:00
Koichiro Iwao	b560a57125	Add existence checks before moving bootc related files	2025-05-19 18:10:18 +09:00
Koichiro Iwao	0a27438f03	Fixes to enable bootc Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>	2025-04-03 13:30:05 +09:00
Koichiro Iwao	49f7d4205e	Enable EROFS	2025-04-01 15:56:09 +09:00
Koichiro Iwao	9820b4550a	Use the consistent directory under /usr/share with the package name	2025-03-28 17:52:28 +09:00
Andrew Lukoshko	a9965eae4e	Merge pull request 'Update to v6.6.74 stable_20250127' (#16 ) from metalefty/raspberrypi:a9 into a9 Reviewed-on: rpms/raspberrypi2#16	2025-02-20 14:59:40 +00:00
Koichiro Iwao	0707826cc8	Update to v6.6.74 stable_20250127 While here, Remove dracut as initramfs is not needed.	2025-02-20 16:21:12 +09:00
Andrew Lukoshko	438247604a	Update sources metadata	2024-10-25 13:11:01 +00:00
Andrew Lukoshko	0c7ed5e275	Merge pull request 'Update to v6.6.51 stable_20241008' (#12 ) from metalefty/raspberrypi:a9 into a9 Reviewed-on: rpms/raspberrypi2#12	2024-10-22 20:32:44 +00:00
Koichiro Iwao	629db978e7	Update to v6.6.51 stable_20241008	2024-10-21 05:41:18 +00:00
Andrew Lukoshko	c9fe821615	Merge pull request 'Add kernel-headers subpackage' (#9 ) from metalefty/raspberrypi:a9 into a9 Reviewed-on: rpms/raspberrypi2#9	2024-09-24 13:37:29 +00:00
Koichiro Iwao	e0ac6af001	Add kernel-headers subpackage	2024-09-05 18:31:15 +09:00
Andrew Lukoshko	7922b49d1c	a9-kernel-tools-fix (#7 ) Reviewed-on: rpms/raspberrypi2#7 Co-authored-by: Andrew Lukoshko <andrew.lukoshko@gmail.com> Co-committed-by: Andrew Lukoshko <andrew.lukoshko@gmail.com>	2024-09-04 09:10:30 +00:00
Andrew Lukoshko	0d7acfc5f7	Merge pull request 'Add kernel-tools to optimize CPU clock (cpupower.service)' (#5 ) from metalefty/raspberrypi:a9 into a9 Reviewed-on: rpms/raspberrypi2#5	2024-06-24 11:58:09 +00:00
Koichiro Iwao	bf0795b47b	Add kernel-tools to optimize CPU clock (cpupower.service)	2024-06-21 06:07:31 +00:00
Andrew Lukoshko	fc957b49f9	Merge pull request 'Add installonlypkg(kernel) to kernel and -devel subpackages and update to v6.6.31' (#2 ) from metalefty/raspberrypi:a9 into a9 Reviewed-on: rpms/raspberrypi2#2	2024-06-13 08:27:45 +00:00
Koichiro Iwao	176ca9d665	Update to v6.6.31 stable_20240529	2024-06-13 07:15:22 +00:00
Koichiro Iwao	5d99ce2b74	Add installonlypkg(kernel) to kernel and -devel subpackages Resolves: https://github.com/AlmaLinux/raspberry-pi/issues/39 See also: https://src.fedoraproject.org/rpms/kernel/c/aba3940	2024-06-04 09:12:46 +00:00
Andrew Lukoshko	1168a780ef	Merge pull request 'Update to 6.6.28 and Raspberry Pi 5 support' (#1 ) from metalefty/raspberrypi:a9 into a9 Reviewed-on: rpms/raspberrypi2#1	2024-05-31 09:28:17 +00:00
Koichiro Iwao	063e282cb8	Update to 6.6.28 and Raspberry Pi 5 support	2024-05-30 08:17:30 +00:00