Fixes to enable bootc

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

.raspberrypi2.metadata

@@ -1,2 +1,2 @@
-cf5423b4444fe7a1d4b548b4e668b6a82ed290e8 SOURCES/stable_20241008.tar.gz
+3b7015807a4ca000fb448ed13b51d63a5dc7a745  SOURCES/1.20250127.tar.gz
-ac72e2f196857ecf73167250e87d33838a3859f7 SOURCES/1.20241008.tar.gz
+dff2a82c96972629d33534897d8aa22d8c19ee94  SOURCES/stable_20250127.tar.gz

SOURCES/config_2711.patch

@@ -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
+@@ -1674,3 +1672,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
 

SOURCES/config_2712.patch

@@ -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
+@@ -1677,3 +1675,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
 

SPECS/raspberrypi2.spec

@@ -1,5 +1,5 @@
-%global firmware_tag	1.20241008
+%global firmware_tag	1.20250127
-%global version_tag	20241008
+%global version_tag	20250127
 
 ExclusiveArch: aarch64
 
@@ -19,7 +19,7 @@ ExclusiveArch: aarch64
 %define ksuffix 4
 
 %define kversion 6.6
-%define patchlevel 51
+%define patchlevel 74
 
 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
@@ -71,7 +71,6 @@ Summary:        The Linux kernel
 Provides:       kernel = %{version}-%{release}
 Provides:       installonlypkg(kernel)
 Requires:	coreutils
-#Requires:	dracut
 
 %description kernel%{?ksuffix}
 The kernel package contains the Linux kernel (vmlinuz), the core of any
@@ -212,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__
@@ -341,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%{?ksuffix}/%{version}-%{release}
-/usr/share/%{name}-kernel/%{version}-%{release}/boot
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
-/usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb
+/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
@@ -354,25 +353,33 @@ find %{buildroot}/usr/include \
 
 
 %posttrans kernel%{?ksuffix}
-if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
+if [ -d /usr/lib/ostree-boot ]; then
-    # if nothing exists, fall back to generating the file, but don't create it
+  mkdir -p /usr/lib/modules/%{version}-%{release}
-    # if we have moved to initramfs
+  mv /usr/lib/ostree-boot/config-%{version}-%{release} /usr/lib/modules/%{version}-%{release}/
-    cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
+  mv /usr/lib/ostree-boot/config-kernel-%{version}-%{release}.inc /usr/lib/modules/%{version}-%{release}/
+  #mv /usr/lib/ostree-boot/initramfs-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/initramfs
+  mv /usr/lib/ostree-boot/kernel-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/vmlinuz
+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/
-/usr/bin/dracut /boot/initramfs-%{version}-%{release}.img %{version}-%{release}
-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%{?ksuffix}/*-*/|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%{?ksuffix}/*-*/|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/overlays/README /boot/overlays/
 cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 
 
@@ -432,6 +439,11 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 %endif
 
 %changelog
+* 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
+- Remove dracut as initramfs is not needed (mentioned in 4.4.21-2)
+
 * Mon Oct 21 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.51-20241008.v8.1
 - Update kernel to version v6.6.51 stable_20241008
 - Update firmware to 1.20241008