Update to v6.6.74 stable_20250127

While here, Remove dracut as initramfs is not needed.

(cherry picked from commit 0707826cc8)

SOURCES/config_2711.patch

@@ -1,21 +1,21 @@
-From bdec30ca8e18bc7d9a5d25d7cd9ca7976aef8aa2 Mon Sep 17 00:00:00 2001
+From 8bdc23947dfc60f7c1e277dc4f87a8bc5fc645c6 Mon Sep 17 00:00:00 2001
 From: Koichiro Iwao <meta@almalinux.org>
-Date: Mon, 19 May 2025 13:09:29 +0900
+Date: Tue, 28 May 2024 15:11:20 +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 | 42 ++++++++++++++++++++++++++--
- 1 file changed, 40 insertions(+), 2 deletions(-)
+ arch/arm64/configs/bcm2711_defconfig | 38 ++++++++++++++++++++++++++--
+ 1 file changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index ce3e13572fb4..324800576e6a 100644
+index e87791286ab4..6fda5b261683 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1690,8 +1690,6 @@ CONFIG_DLM=m
- CONFIG_UNICODE=m
+@@ -1622,8 +1622,6 @@ CONFIG_NLS_KOI8_U=m
+ CONFIG_DLM=m
  CONFIG_KEY_DH_OPERATIONS=y
  CONFIG_SECURITY=y
 -CONFIG_SECURITY_APPARMOR=y
@@ -23,7 +23,7 @@ index ce3e13572fb4..324800576e6a 100644
  CONFIG_CRYPTO_USER=m
  CONFIG_CRYPTO_CRYPTD=m
  CONFIG_CRYPTO_AES=m
-@@ -1742,3 +1740,43 @@ CONFIG_SCHED_TRACER=y
+@@ -1674,3 +1672,39 @@ CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
  # CONFIG_STRICT_DEVMEM is not set
@@ -63,10 +63,6 @@ index ce3e13572fb4..324800576e6a 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.49.0
+2.45.1
 

SOURCES/config_2712.patch

@@ -1,21 +1,21 @@
-From c6064f14a8c32e3109ee83c736097e2ee03086ca Mon Sep 17 00:00:00 2001
+From 5ae1f73a82e6ba1203d031c5c82943865dce8174 Mon Sep 17 00:00:00 2001
 From: Koichiro Iwao <meta@almalinux.org>
-Date: Mon, 19 May 2025 13:10:35 +0900
+Date: Tue, 28 May 2024 15:14:02 +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 | 42 ++++++++++++++++++++++++++--
- 1 file changed, 40 insertions(+), 2 deletions(-)
+ arch/arm64/configs/bcm2712_defconfig | 38 ++++++++++++++++++++++++++--
+ 1 file changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig
-index 9e2bda050f81..51afa99f75e3 100644
+index 79c4332581eb..7b63683ff687 100644
 --- a/arch/arm64/configs/bcm2712_defconfig
 +++ b/arch/arm64/configs/bcm2712_defconfig
-@@ -1692,8 +1692,6 @@ CONFIG_DLM=m
- CONFIG_UNICODE=m
+@@ -1625,8 +1625,6 @@ CONFIG_NLS_KOI8_U=m
+ CONFIG_DLM=m
  CONFIG_KEY_DH_OPERATIONS=y
  CONFIG_SECURITY=y
 -CONFIG_SECURITY_APPARMOR=y
@@ -23,7 +23,7 @@ index 9e2bda050f81..51afa99f75e3 100644
  CONFIG_CRYPTO_USER=m
  CONFIG_CRYPTO_CRYPTD=m
  CONFIG_CRYPTO_AES=m
-@@ -1744,3 +1742,43 @@ CONFIG_SCHED_TRACER=y
+@@ -1677,3 +1675,39 @@ CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
  # CONFIG_STRICT_DEVMEM is not set
@@ -63,10 +63,6 @@ index 9e2bda050f81..51afa99f75e3 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.49.0
+2.45.1
 

SPECS/raspberrypi2.spec

@@ -1,5 +1,5 @@
-%global firmware_tag	1.20250430
-%global version_tag	20250428
+%global firmware_tag	1.20250127
+%global version_tag	20250127
 
 ExclusiveArch: aarch64
 
@@ -18,8 +18,8 @@ ExclusiveArch: aarch64
 %define rpisuffix 2
 %define ksuffix 4
 
-%define kversion 6.12
-%define patchlevel 25
+%define kversion 6.6
+%define patchlevel 74
 
 # 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%{?ksuffix}/%{version}-%{release}/boot/overlays
+mkdir -p %{buildroot}/usr/share/%{name}-kernel/%{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%{?ksuffix}/%{version}-%{release}/boot/overlays
+cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
 %ifarch aarch64
-cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
 %else
-cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
 %endif
-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/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel/%{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%{?ksuffix}/%{version}-%{release}
-/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
-/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb
+/usr/share/%{name}-kernel/%{version}-%{release}
+/usr/share/%{name}-kernel/%{version}-%{release}/boot
+/usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb
 /boot/config-%{version}-%{release}
 /boot/overlays/
-/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*
+/usr/share/%{name}-kernel/%{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,39 +353,24 @@ find %{buildroot}/usr/include \
 
 
 %posttrans kernel%{?ksuffix}
-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
+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
 
 %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%{?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 -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 -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 
 
@@ -445,16 +430,6 @@ 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