From be92a95e169422f1108bce0aee70ed96fc26fb0b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Apr 19 2023 07:58:07 +0000
Subject: Split Realtek, Qcom Atheros, Mediatek, brcmfmac WiFi/BT firmwares to subpackages


---

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 75c1059..d585525 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -20,6 +20,17 @@ Requires:	linux-firmware-whence
 Provides:	kernel-firmware = %{version}
 Obsoletes:	kernel-firmware < %{version}
 Conflicts:	microcode_ctl < 2.1-0
+%if 0%{?fedora} > 38
+Recommends:	atheros-firmware
+Recommends:	brcmfmac-firmware
+Recommends:	mt7xxx-firmware
+Recommends:	realtek-firmware
+%else
+Requires:	atheros-firmware
+Requires:	brcmfmac-firmware
+Requires:	mt7xxx-firmware
+Requires:	realtek-firmware
+%endif
 %if 0%{?fedora} > 36
 Recommends:	amd-gpu-firmware
 Recommends:	intel-gpu-firmware
@@ -64,7 +75,21 @@ Requires:	linux-firmware-whence
 %description -n nvidia-gpu-firmware
 Firmware for NVIDIA GPUs.
 
-# WiFi firmwares
+# WiFi/Bluetooth firmwares
+%package -n atheros-firmware
+Summary:	Firmware for Qualcomm Atheros WiFi/Bluetooth adapters
+License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
+%description -n atheros-firmware
+Firmware for Qualcomm Atheros ath6k/ath9k/ath10k/ath11k WiFi adapters.
+
+%package -n brcmfmac-firmware
+Summary:	Firmware for Broadcom/Cypress brcmfmac WiFi/Bluetooth adapters
+License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
+%description -n brcmfmac-firmware
+Firmware for Broadcom/Cypress brcmfmac WiFi/Bluetooth adapters.
+
 %package -n iwl100-firmware
 Summary:	Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters
 License:	Redistributable, no modification permitted
@@ -291,6 +316,20 @@ Requires:	linux-firmware-whence
 Firmware for Marvell Libertas USB 8388 Network Adapter with OLPC mesh network
 support.
 
+%package -n mt7xxx-firmware
+Summary:	Firmware for Mediatek 7600/7900 series WiFi/Bluetooth adapters
+License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
+%description -n mt7xxx-firmware
+Firmware for Mediatek 7600/7900 series WiFi/Bluetooth adapters
+
+%package -n realtek-firmware
+Summary:	Firmware for Realtek WiFi/Bluetooth adapters
+License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
+%description -n realtek-firmware
+Firmware for Realtek WiFi/Bluetooth adapters
+
 # SMART NIC and network switch firmwares
 %package -n liquidio-firmware
 Summary:	Firmware for Cavium LiquidIO Intelligent Server Adapter
@@ -372,7 +411,13 @@ popd
 sed -i -e 's:^./::' linux-firmware.{files,dirs}
 sed \
 	-i -e '/^amdgpu/d' \
-	-i -e '/^radeon/d' \
+	-i -e '/^ar3k/d' \
+	-i -e '/^ath6k/d' \
+	-i -e '/^ath9k_htc/d' \
+	-i -e '/^ath10k/d' \
+	-i -e '/^ath11k/d' \
+	-i -e '/^brcm/d' \
+	-i -e '/^cypress/d' \
 	-i -e '/^i915/d' \
 	-i -e '/^iwlwifi/d' \
 	-i -e '/^nvidia\/g/d' \
@@ -381,9 +426,19 @@ sed \
 	-i -e '/^libertas\/usb8388/d' \
 	-i -e '/^liquidio/d' \
 	-i -e '/^mellanox/d' \
+	-i -e '/^mediatek\/mt76/d' \
+	-i -e '/^mediatek\/mt79/d' \
+	-i -e '/^mediatek\/BT/d' \
+	-i -e '/^mediatek\/WIFI/d' \
 	-i -e '/^mrvl\/prestera/d' \
 	-i -e '/^mrvl\/sd8787/d' \
 	-i -e '/^netronome/d' \
+	-i -e '/^qca/d' \
+	-i -e '/^radeon/d' \
+	-i -e '/^rtl_bt/d' \
+	-i -e '/^rtlwifi/d' \
+	-i -e '/^rtw88/d' \
+	-i -e '/^rtw89/d' \
 	linux-firmware.files
 sed -i -e 's!^!/usr/lib/firmware/!' linux-firmware.{files,dirs}
 sed -i -e 's/^/"/;s/$/"/' linux-firmware.files
@@ -397,6 +452,7 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %files whence
 %license WHENCE
 
+# GPU firmwares
 %files -n amd-gpu-firmware
 %license LICENSE.radeon LICENSE.amdgpu
 %{_firmwarepath}/amdgpu/
@@ -411,6 +467,26 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %{_firmwarepath}/nvidia/g*/
 %{_firmwarepath}/nvidia/tu*/
 
+# WiFi/Bluetooth firmwares
+%files -n atheros-firmware
+%license LICENCE.atheros_firmware
+%license LICENSE.QualcommAtheros_ar3k
+%license LICENSE.QualcommAtheros_ath10k
+%license LICENCE.open-ath9k-htc-firmware
+%license qca/NOTICE.txt
+%{_firmwarepath}/ar3k/
+%{_firmwarepath}/ath6k/
+%{_firmwarepath}/ath9k_htc/
+%{_firmwarepath}/ath10k/
+%{_firmwarepath}/ath11k/
+%{_firmwarepath}/qca/
+
+%files -n brcmfmac-firmware
+%license LICENCE.broadcom_bcm43xx
+%license LICENCE.cypress
+%{_firmwarepath}/brcm/
+%{_firmwarepath}/cypress/
+
 %files -n iwl100-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-100-5.ucode*
@@ -509,6 +585,22 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %dir %{_firmwarepath}/libertas
 %{_firmwarepath}/libertas/usb8388_olpc.bin*
 
+%files -n mt7xxx-firmware
+%license LICENCE.mediatek
+%license LICENCE.ralink_a_mediatek_company_firmware
+%{_firmwarepath}/mediatek/mt76*
+%{_firmwarepath}/mediatek/mt79*
+%{_firmwarepath}/mediatek/BT*
+%{_firmwarepath}/mediatek/WIFI*
+
+%files -n realtek-firmware
+%license LICENCE.rtlwifi_firmware.txt
+%{_firmwarepath}/rtl_bt/
+%{_firmwarepath}/rtlwifi/
+%{_firmwarepath}/rtw88/
+%{_firmwarepath}/rtw89/
+
+# SMART NIC and network switch firmwares
 %files -n liquidio-firmware
 %license LICENCE.cavium_liquidio
 %dir %{_firmwarepath}/liquidio
@@ -530,6 +622,7 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 
 %changelog
 * Sun Apr 09 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 20230404-149
+- Split Realtek, Qcom Atheros, Mediatek, brcmfmac WiFi/BT firmwares to subpackages
 - Update to upstream 20230404 release
 - nvidia: update Tu10x and Tu11x signed firmware to support newer Turing HW
 - update firmware for MT7922 WiFi/Bluetooth device