SPECS/raspberrypi2.spec

@@ -1,5 +1,5 @@
-%global firmware_tag	1.20241008
+%global commit_firmware_long 734829e3525e5baea62d1deedbe65eb60f4fb36b
-%global version_tag	20241008
+%global version_tag	20240529
 
 ExclusiveArch: aarch64
 
@@ -11,7 +11,7 @@ ExclusiveArch: aarch64
 
 %define local_version v8
 %define bcmmodel 2711
-%define extra_version 1
+%define extra_version 4
 
 # 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 51
+%define patchlevel 31
 
 # 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/refs/tags/%{firmware_tag}.tar.gz
+Source1:        https://github.com/raspberrypi/firmware/archive/%{commit_firmware_long}.tar.gz
 Patch100:       config_2711.patch
 Patch101:       config_2712.patch
 # Sources for kernel-tools
@@ -273,13 +273,12 @@ ln -T -s build %{buildroot}/lib/modules/%{version}-%{release}/source --force
 # firmware
 #   precompiled GPU firmware and bootloader
 pushd %{buildroot}
-tar -xf %{_sourcedir}/%{firmware_tag}.tar.gz \
+tar -xf %{_sourcedir}/%{commit_firmware_long}.tar.gz \
-    firmware-%{firmware_tag}/boot/start* \
+    firmware-%{commit_firmware_long}/boot/start* \
-    firmware-%{firmware_tag}/boot/fixup* \
+    firmware-%{commit_firmware_long}/boot/fixup* \
-    firmware-%{firmware_tag}/boot/LICENCE.broadcom \
+    firmware-%{commit_firmware_long}/boot/LICENCE.broadcom \
-    firmware-%{firmware_tag}/boot/bootcode.bin \
+    firmware-%{commit_firmware_long}/boot/bootcode.bin \
     --strip-components=1
-%{__chmod} -x %{buildroot}/boot/start*.elf
 popd
 %endif
 
@@ -432,10 +431,6 @@ 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