From a98fea12e448ec2b4c8a0aa37ed71ab5ab9820b4 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Tue, 15 Jul 2025 10:39:58 +0900 Subject: [PATCH 1/3] Add subpackages for RPi 3 (cherry picked from commit f299a9e857aedf6cb2d22c2d3c97945a6da4e60e) --- SPECS/linux-firmware-raspberrypi.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/SPECS/linux-firmware-raspberrypi.spec b/SPECS/linux-firmware-raspberrypi.spec index 5a029b0..0b6b405 100644 --- a/SPECS/linux-firmware-raspberrypi.spec +++ b/SPECS/linux-firmware-raspberrypi.spec @@ -8,7 +8,7 @@ Name: linux-firmware-raspberrypi Version: 20240528 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Supplemental firmware used by Linux kernel for some Raspberry Pi models BuildArch: noarch ExclusiveArch: aarch64 @@ -27,6 +27,12 @@ Requires: linux-firmware This package provides suppremental firmware files not included in linux-firmware package to enable Bluetooth/Wi-Fi on some Raspberry Pi models. +%package rpi3 +Summary: Supplemental firmware used by Linux kernel for Raspberry Pi 3 + +%description rpi3 +This package provides suppremental firmware files specific to Raspberry Pi 3. + %prep %setup -n %{fn_srcdir} %setup -n %{fn_srcdir} -a 1 @@ -67,11 +73,24 @@ ln -s brcmfmac43456-sdio.txt.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456- ln -s BCM4345C0.hcd.xz %{buildroot}%{_firmwarepath}/brcm/BCM4345C0.raspberrypi,5-model-b.hcd.xz ln -s brcmfmac43455-sdio.bin.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin.xz ln -s brcmfmac43455-sdio.clm_blob.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.clm_blob.xz +# Raspberry Pi 3 +# These files need to be decompressed for Pi 3. +# https://bugs.almalinux.org/view.php?id=544 +install -c -m 644 debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin %{buildroot}%{_firmwarepath}/brcm/ +install -c -m 644 debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.clm_blob %{buildroot}%{_firmwarepath}/brcm/ +install -c -m 644 debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt %{buildroot}%{_firmwarepath}/brcm/ %files %{_firmwarepath}/brcm/* +%files rpi3 +%{_firmwarepath}/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.* + %changelog +* Mon Jul 14 2025 Koichiro Iwao - 20240528-6 +- Add subpackage for RPi 3 + https://bugs.almalinux.org/view.php?id=544 + * Thu Jul 25 2024 Andrew Lukoshko - 20240528-5 - Update to not conflict with linux-firmware-20240603-143.1.el9_4 -- 2.47.1 From 79bc2c1ce096cc9475fb1a5a5de460a193017d79 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Tue, 15 Jul 2025 12:51:47 +0900 Subject: [PATCH 2/3] Subpackage requires main package --- SPECS/linux-firmware-raspberrypi.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SPECS/linux-firmware-raspberrypi.spec b/SPECS/linux-firmware-raspberrypi.spec index 0b6b405..7233244 100644 --- a/SPECS/linux-firmware-raspberrypi.spec +++ b/SPECS/linux-firmware-raspberrypi.spec @@ -28,6 +28,7 @@ This package provides suppremental firmware files not included in linux-firmware package to enable Bluetooth/Wi-Fi on some Raspberry Pi models. %package rpi3 +Requires: %{name} = %{version}-%{release} Summary: Supplemental firmware used by Linux kernel for Raspberry Pi 3 %description rpi3 -- 2.47.1 From 4011c9b8e58fb31685e42d860b5072c9b6995657 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 10 Jan 2025 13:59:35 +0000 Subject: [PATCH 3/3] Update .linux-firmware-raspberrypi.metadata (cherry picked from commit d1592b4772ca26f3154a8c13c19f77ad097f6f43) --- .linux-firmware-raspberrypi.metadata | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.linux-firmware-raspberrypi.metadata b/.linux-firmware-raspberrypi.metadata index 80cb46e..381e8a8 100644 --- a/.linux-firmware-raspberrypi.metadata +++ b/.linux-firmware-raspberrypi.metadata @@ -1,2 +1,2 @@ -6bdeabc9c00f455499591d9d13dd9287b5087093 SOURCES/bluez-firmware-d9d4741caba7314d6500f588b1eaa5ab387a4ff5.tar.gz -e9a36b078988c69e10fc8e1fb65054be402386a9 SOURCES/firmware-nonfree-995129a86915fa3165a24d0a29419f6349f8f36b.tar.gz +b47abad65dfb13dfa664d9fdb08482591148bf74 SOURCES/firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897.tar.gz +6bdeabc9c00f455499591d9d13dd9287b5087093 SOURCES/bluez-firmware-d9d4741caba7314d6500f588b1eaa5ab387a4ff5.tar.gz -- 2.47.1