- more subpackages and fixes

diff --git a/linux-firmware.spec b/linux-firmware.spec
index f6ffe556cd16f97e9bfc1736de96b467b6acc67c..6567a45a95ded96fcc2a0f84aae31f604083cc66 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -33,6 +33,14 @@ operate.
 Ten pakiet zawiera pliki firmware'u wymagane do działania niektórych
 urządzeń.
 
+%package -n alacritech-firmware
+Summary:       Firmware for Alacritech IS-NIC products
+License:       Redistributable, no modification permitted
+Group:         Base/Kernel
+
+%description -n alacritech-firmware
+Firmware for Alacritech IS-NIC products
+
 %package -n alsa-firmware
 Summary:       Firmware for Advanced Linux Sound Architecture
 License:       Redistributable, no modification permitted
@@ -58,6 +66,14 @@ Group:               Base/Kernel
 %description -n atheros-firmware
 Firmware for Atheros wireless and Bluetooth cards
 
+%package -n av-firmware
+Summary:       Firmware for various audio/video devices
+License:       Redistributable, no modification permitted
+Group:         Base/Kernel
+
+%description -n av-firmware
+Firmware for various audio/video devices
+
 %package -n bnx2-firmware
 Summary:       Firmware for Broadcom NetXtremeII
 License:       Redistributable, no modification permitted
@@ -458,14 +474,13 @@ Firmware for USB ADSL Modems based on Eagle chipsets
 
 %prep
 %setup -q
-#%{__mv} linux-firmware-*/* .
-#%{__rm} -r linux-firmware-*
 
 # Remove source files we don't need to install
 %{__rm} */*.asm dsp56k/{Makefile,concat-bootstrap.pl} isci/{Makefile,README,*.[ch]}
 %{__rm} -r carl9170fw usbdux
 %{__rm} Makefile configure
 
+%{__mv} amd-ucode/README README.amd-ucode
 %{__mv} rtw88/README README.rtw88
 
 %install
@@ -483,41 +498,20 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/acenic
 /lib/firmware/adaptec
 /lib/firmware/advansys
-/lib/firmware/airoha
 /lib/firmware/agere_*_fw.bin
+/lib/firmware/airoha
 /lib/firmware/amd
 /lib/firmware/amdtee
 /lib/firmware/amlogic
-/lib/firmware/amphion
 /lib/firmware/arm
-/lib/firmware/as102_data1_st.hex
-/lib/firmware/as102_data2_st.hex
 /lib/firmware/atmel
 /lib/firmware/atusb
-/lib/firmware/av7110
 /lib/firmware/carl9170-1.fw
 /lib/firmware/cadence
 /lib/firmware/cis
-/lib/firmware/cmmb_*_12mhz.inp
-/lib/firmware/cnm
-/lib/firmware/cpia2
-/lib/firmware/dabusb
-/lib/firmware/dsp56k
-/lib/firmware/dvb-fe-xc4000-*.fw
-/lib/firmware/dvb-fe-xc5000c-*.fw
-/lib/firmware/dvb-fe-xc5000-*.fw
-/lib/firmware/dvb_nova_12mhz*.inp
-/lib/firmware/dvb-usb-dib0700-*.fw
-/lib/firmware/dvb-usb-it9135-01.fw
-/lib/firmware/dvb-usb-it9135-02.fw
-/lib/firmware/dvb-usb-terratec-h5-drxk.fw
 /lib/firmware/e100
 /lib/firmware/edgeport
-/lib/firmware/emi26
-/lib/firmware/emi62
 /lib/firmware/ene-ub6250
-/lib/firmware/f2255usb.bin
-/lib/firmware/go7007
 /lib/firmware/hfi1_dc8051.fw
 /lib/firmware/hfi1_fabric.fw
 /lib/firmware/hfi1_pcie.fw
@@ -527,15 +521,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/firmware/intel
 /lib/firmware/intel/ice
 /lib/firmware/isci
-/lib/firmware/isdbt_*.inp
 /lib/firmware/ixp4xx
 /lib/firmware/kaweth
 /lib/firmware/keyspan
 /lib/firmware/keyspan_pda
-/lib/firmware/lgs8g75.fw
 /lib/firmware/lt9611uxc_fw.bin
 /lib/firmware/matrox
-/lib/firmware/meson
 /lib/firmware/microchip
 /lib/firmware/moxa
 /lib/firmware/mts_*.fw
@@ -571,39 +562,31 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/rt3090.bin
 /lib/firmware/rt3290.bin
 /lib/firmware/rt73.bin
-/lib/firmware/s2250.fw
-/lib/firmware/s2250_loader.fw
-/lib/firmware/s5p-mfc.fw
-/lib/firmware/s5p-mfc-v6.fw
-/lib/firmware/s5p-mfc-v6-v2.fw
-/lib/firmware/s5p-mfc-v7.fw
-/lib/firmware/s5p-mfc-v8.fw
-/lib/firmware/s5p-mfc-v12.fw
 /lib/firmware/sdd_sagrad_*.bin
-/lib/firmware/slicoss
-/lib/firmware/sms1xxx-*.fw
 /lib/firmware/sun
-/lib/firmware/sxg
-/lib/firmware/tdmb_nova_12mhz.inp
 /lib/firmware/tehuti
 /lib/firmware/tigon
 /lib/firmware/tlg2300_firmware.bin
 /lib/firmware/tsse_firmware.bin
 /lib/firmware/ttusb-budget
 /lib/firmware/usbdux*_firmware.bin
-/lib/firmware/v4l-cx*.fw
 /lib/firmware/vicam
 /lib/firmware/vntwusb.fw
 /lib/firmware/vxge
 /lib/firmware/wfx
 /lib/firmware/whiteheat*.fw
 /lib/firmware/wsm_22.bin
-/lib/firmware/xe
 /lib/firmware/yam
 
-%files -n alsa-firmware
+%files -n alacritech-firmware
 %defattr(644,root,root,755)
 %doc WHENCE
+/lib/firmware/slicoss
+/lib/firmware/sxg
+
+%files -n alsa-firmware
+%defattr(644,root,root,755)
+%doc WHENCE LICENCE.ca0132 LICENSE.cirrus
 /lib/firmware/cirrus
 /lib/firmware/cs42l43.bin
 /lib/firmware/ctefx.bin
@@ -622,7 +605,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n atheros-firmware
 %defattr(644,root,root,755)
-%doc WHENCE LICENCE.atheros_firmware LICENSE.QualcommAtheros_ar3k LICENSE.QualcommAtheros_ath10k LICENCE.open-ath9k-htc-firmware
+%doc WHENCE LICENCE.atheros_firmware LICENCE.open-ath9k-htc-firmware LICENSE.qcom LICENSE.QualcommAtheros_ar3k LICENSE.QualcommAtheros_ath10k
 /lib/firmware/ar3k
 /lib/firmware/ar5523.bin
 /lib/firmware/ar7010*.fw
@@ -640,6 +623,46 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/wil6210.brd
 /lib/firmware/wil6210.fw
 
+%files -n av-firmware
+%defattr(644,root,root,755)
+%doc WHENCE LICENCE.Abilis LICENSE.amlogic_vdec LICENSE.amphion_vpu LICENCE.cnm LICENSE.dib0700 LICENCE.go7007 LICENCE.siano LICENCE.xc4000
+/lib/firmware/amphion
+/lib/firmware/as102_data1_st.hex
+/lib/firmware/as102_data2_st.hex
+/lib/firmware/av7110
+/lib/firmware/cmmb_*_12mhz.inp
+/lib/firmware/cnm
+/lib/firmware/cpia2
+/lib/firmware/dabusb
+/lib/firmware/dsp56k
+/lib/firmware/dvb-fe-xc4000-*.fw
+/lib/firmware/dvb-fe-xc5000c-*.fw
+/lib/firmware/dvb-fe-xc5000-*.fw
+/lib/firmware/dvb_nova_12mhz*.inp
+/lib/firmware/dvb-usb-dib0700-*.fw
+/lib/firmware/dvb-usb-it9135-01.fw
+/lib/firmware/dvb-usb-it9135-02.fw
+/lib/firmware/dvb-usb-terratec-h5-drxk.fw
+/lib/firmware/emi26
+/lib/firmware/emi62
+/lib/firmware/f2255usb.bin
+/lib/firmware/go7007
+/lib/firmware/isdbt_*.inp
+/lib/firmware/lgs8g75.fw
+/lib/firmware/meson
+/lib/firmware/s5p-mfc.fw
+/lib/firmware/s5p-mfc-v6.fw
+/lib/firmware/s5p-mfc-v6-v2.fw
+/lib/firmware/s5p-mfc-v7.fw
+/lib/firmware/s5p-mfc-v8.fw
+/lib/firmware/s5p-mfc-v12.fw
+/lib/firmware/sms1xxx-*.fw
+/lib/firmware/s2250.fw
+/lib/firmware/s2250_loader.fw
+/lib/firmware/tdmb_nova_12mhz.inp
+/lib/firmware/v4l-cx*.fw
+
+
 %files -n bnx2-firmware
 %defattr(644,root,root,755)
 %doc WHENCE
@@ -658,7 +681,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n cavium-firmware
 %defattr(644,root,root,755)
-%doc WHENCE LICENCE.cavium
+%doc WHENCE LICENCE.cavium LICENCE.cavium_liquidio
 /lib/firmware/cavium
 /lib/firmware/liquidio
 
@@ -676,12 +699,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n intel-gpu-firmware
 %defattr(644,root,root,755)
-%doc WHENCE LICENSE.i915
+%doc WHENCE LICENSE.i915 LICENSE.xe
 /lib/firmware/i915
+/lib/firmware/xe
 
 %files -n intel-sound-firmware
 %defattr(644,root,root,755)
-%doc WHENCE LICENCE.adsp_sst LICENCE.fw_sst_0f28
+%doc WHENCE LICENCE.adsp_sst LICENCE.IntcSST2 LICENCE.fw_sst_0f28
 %dir /lib/firmware/intel
 /lib/firmware/intel/avs
 /lib/firmware/intel/catpt
@@ -691,7 +715,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n intel-vsc-firmware
 %defattr(644,root,root,755)
-%doc WHENCE LICENSE.ivsc
+%doc WHENCE LICENSE.ipu3_firmware LICENSE.ivsc
 %dir /lib/firmware/intel
 /lib/firmware/intel/ipu
 /lib/firmware/intel/vsc
@@ -818,7 +842,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n marvell-firmware
 %defattr(644,root,root,755)
-%doc WHENCE LICENCE.Marvell LICENCE.OLPC
+%doc WHENCE LICENCE.Marvell LICENCE.NXP LICENCE.OLPC
 /lib/firmware/lbtf_usb.bin
 /lib/firmware/libertas
 /lib/firmware/mrvl
@@ -827,7 +851,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mediatek-firmware
 %defattr(644,root,root,755)
-%doc WHENCE LICENCE.ralink_a_mediatek_company_firmware LICENCE.mediatek
+%doc WHENCE LICENCE.mediatek LICENCE.ralink_a_mediatek_company_firmware LICENCE.ralink-firmware.txt
 /lib/firmware/mediatek
 /lib/firmware/mt7601u.bin
 /lib/firmware/mt7650.bin
@@ -843,16 +867,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n microcode-data-amd
 %defattr(644,root,root,755)
-%doc WHENCE LICENSE.amd-ucode amd-ucode/README
+%doc WHENCE LICENSE.amd-ucode README.amd-ucode
 /lib/firmware/amd-ucode
 
 %files -n netronome-firmware
 %defattr(644,root,root,755)
-%doc WHENCE
+%doc WHENCE LICENCE.Netronome
 /lib/firmware/netronome
+
 %files -n nxp
 %defattr(644,root,root,755)
-%doc WHENCE LICENSE.nxp_mc_firmware
+%doc WHENCE LICENSE.nxp LICENSE.nxp_mc_firmware
 /lib/firmware/dpaa2
 /lib/firmware/nxp
 
@@ -885,7 +910,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n realtek-firmware
 %defattr(644,root,root,755)
-%doc WHENCE LICENCE.rtlwifi_firmware.txt
+%doc WHENCE LICENCE.rtlwifi_firmware.txt README.rtw88
 /lib/firmware/rtl_bt
 /lib/firmware/rtl_nic
 /lib/firmware/rtlwifi