Fixes to enable bootc

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

.raspberrypi2.metadata

@@ -1,2 +1,2 @@
-60c685b1ff49b11454c147944a6f4e9e24cd05db  SOURCES/734829e3525e5baea62d1deedbe65eb60f4fb36b.tar.gz
+cf5423b4444fe7a1d4b548b4e668b6a82ed290e8 SOURCES/stable_20241008.tar.gz
-3b0f152bca3eada3b0796fc95da0f025864a70c1  SOURCES/stable_20240529.tar.gz
+ac72e2f196857ecf73167250e87d33838a3859f7 SOURCES/1.20241008.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 commit_firmware_long 734829e3525e5baea62d1deedbe65eb60f4fb36b
+%global firmware_tag	1.20241008
-%global version_tag	20240529
+%global version_tag	20241008
 
 ExclusiveArch: aarch64
 
@@ -11,7 +11,7 @@ ExclusiveArch: aarch64
 
 %define local_version v8
 %define bcmmodel 2711
-%define extra_version 4
+%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.
@@ -19,7 +19,7 @@ ExclusiveArch: aarch64
 %define ksuffix 4
 
 %define kversion 6.6
-%define patchlevel 31
+%define patchlevel 51
 
 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
@@ -38,7 +38,7 @@ Summary:        Specific kernel and bootcode for Raspberry Pi
 License:        GPLv2
 URL:            https://github.com/raspberrypi/linux
 Source0:        https://github.com/raspberrypi/linux/archive/refs/tags/stable_%{version_tag}.tar.gz
-Source1:        https://github.com/raspberrypi/firmware/archive/%{commit_firmware_long}.tar.gz
+Source1:        https://github.com/raspberrypi/firmware/archive/refs/tags/%{firmware_tag}.tar.gz
 Patch100:       config_2711.patch
 Patch101:       config_2712.patch
 # Sources for kernel-tools
@@ -273,12 +273,13 @@ ln -T -s build %{buildroot}/lib/modules/%{version}-%{release}/source --force
 # firmware
 #   precompiled GPU firmware and bootloader
 pushd %{buildroot}
-tar -xf %{_sourcedir}/%{commit_firmware_long}.tar.gz \
+tar -xf %{_sourcedir}/%{firmware_tag}.tar.gz \
-    firmware-%{commit_firmware_long}/boot/start* \
+    firmware-%{firmware_tag}/boot/start* \
-    firmware-%{commit_firmware_long}/boot/fixup* \
+    firmware-%{firmware_tag}/boot/fixup* \
-    firmware-%{commit_firmware_long}/boot/LICENCE.broadcom \
+    firmware-%{firmware_tag}/boot/LICENCE.broadcom \
-    firmware-%{commit_firmware_long}/boot/bootcode.bin \
+    firmware-%{firmware_tag}/boot/bootcode.bin \
     --strip-components=1
+%{__chmod} -x %{buildroot}/boot/start*.elf
 popd
 %endif
 
@@ -353,16 +354,24 @@ find %{buildroot}/usr/include \
 
 
 %posttrans kernel%{?ksuffix}
-if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
+if [ -d /boot ]; then
-    # if nothing exists, fall back to generating the file, but don't create it
+    if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
-    # if we have moved to initramfs
+        # if nothing exists, fall back to generating the file, but don't create it
-    cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
+        # 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/
+    /usr/bin/dracut /boot/initramfs-%{version}-%{release}.img %{version}-%{release}
+    cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
+elif [ -d /usr/lib/ostree-boot ]; then
+    mv /usr/lib/ostree-boot/config-%{version}-%{release} /usr/lib/modules/%{version}-%{release}
+    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
+    ls /usr/lib/modules/%{version}-%{release}
 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
@@ -431,6 +440,10 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 %endif
 
 %changelog
+* 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
+
 * Thu Sep 05 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.31-20240529.v8.4
 - Add kernel-headers subpackage