Update to 6.12.25 stable_20250428

(cherry picked from commit 6627c4c42b)

.raspberrypi2.metadata

@@ -1,2 +1,2 @@
-3b7015807a4ca000fb448ed13b51d63a5dc7a745  SOURCES/1.20250127.tar.gz
+716cf8d994e7c3794489e9c33de8c77c466d2a46  SOURCES/1.20250430.tar.gz
-dff2a82c96972629d33534897d8aa22d8c19ee94  SOURCES/stable_20250127.tar.gz
+37b6749bb055db30a8496f0bf60e14465304416e  SOURCES/stable_20250428.tar.gz

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 ++++++++++++++++++++++++++--
+ arch/arm64/configs/bcm2711_defconfig | 42 ++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
+ 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
+@@ -1690,8 +1690,6 @@ CONFIG_DLM=m
- 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,43 @@ 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
@@ -68,5 +68,5 @@ index e87791286ab4..6fda5b261683 100644
 +CONFIG_EROFS_POSIX_ACL=y
 +CONFIG_EROFS_FS_SECURITY=y
 -- 
-2.45.1
+2.49.0
 

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 ++++++++++++++++++++++++++--
+ arch/arm64/configs/bcm2712_defconfig | 42 ++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
+ 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
+@@ -1692,8 +1692,6 @@ CONFIG_DLM=m
- 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,43 @@ 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
@@ -68,5 +68,5 @@ index 79c4332581eb..7b63683ff687 100644
 +CONFIG_EROFS_POSIX_ACL=y
 +CONFIG_EROFS_FS_SECURITY=y
 -- 
-2.45.1
+2.49.0
 

SPECS/raspberrypi2.spec

@@ -1,5 +1,5 @@
-%global firmware_tag	1.20250127
+%global firmware_tag	1.20250430
-%global version_tag	20250127
+%global version_tag	20250428
 
 ExclusiveArch: aarch64
 
@@ -11,15 +11,15 @@ ExclusiveArch: aarch64
 
 %define local_version v8
 %define bcmmodel 2711
-%define extra_version 2
+%define extra_version 1
 
 # This originally implies Kernel 4.x for RPi 2 and is not appropriate now.
 # Be careful to change this not to disturb the seamless package update.
 %define rpisuffix 2
 %define ksuffix 4
 
-%define kversion 6.6
+%define kversion 6.12
-%define patchlevel 74
+%define patchlevel 25
 
 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
@@ -372,9 +372,9 @@ if [ -d /boot ]; then
       # 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%{?ksuffix}/%{version}-%{release}/boot/*.dtb /boot/
-  cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
+  cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
-  cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/README /boot/overlays/
+  cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/README /boot/overlays/
   cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
 fi
 
@@ -445,6 +445,12 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 %endif
 
 %changelog
+* Mon May 26 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
+- Apply the consistent directory under /usr/share (fix missed cases)
+
 * Mon Apr 14 2025 Koichiro Iwao <meta@almalinux.org> - 6.6.74-20250127.v8.2
 - Fixes to enable bootc
 - Enable EROFS