From e4d3c1c13f125fb123d3e9138a81716598e149d0 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 18 May 2018 23:52:52 +0000 Subject: [PATCH] - merged libertas-*-firmware into single libertas-firmware - more subpackages, cosmetics, misc fixes --- linux-firmware.spec | 170 ++++++++++++++++++++------------------------ 1 file changed, 79 insertions(+), 91 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 9ed6ea8..eb4bc98 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -25,60 +25,76 @@ Ten pakiet zawiera pliki firmware'u wymagane do działania niektórych urządzeń. %package -n amd-gpu-firmware -Summary: Firmware for the AMD/ATI graphics chips +Summary: Firmware for AMD/ATI graphics chips License: Redistributable, no modification permitted Group: Base/Kernel %description -n amd-gpu-firmware -Firmware for the AMD/ATI graphics chips +Firmware for AMD/ATI graphics chips + +%package -n atheros-firmware +Summary: Firmware for Atheros wireless and Bluetooth cards +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n atheros-firmware +Firmware for Atheros wireless and Bluetooth cards %package -n bnx2-firmware -Summary: Firmware for the Broadcom NetXtremeII +Summary: Firmware for Broadcom NetXtremeII License: Redistributable, no modification permitted Group: Base/Kernel %description -n bnx2-firmware -Firmware for the Broadcom NetXtremeII +Firmware for Broadcom NetXtremeII %package -n bnx2x-firmware -Summary: Firmware for the Broadcom NetXtreme II 10Gb +Summary: Firmware for Broadcom NetXtreme II 10Gb License: Redistributable, no modification permitted Group: Base/Kernel %description -n bnx2x-firmware -Firmware for the Broadcom NetXtreme II 10Gb +Firmware for Broadcom NetXtreme II 10Gb %package -n brcm-firmware -Summary: Firmware for the Broadcom 802.11 wireless cards +Summary: Firmware for Broadcom 802.11 wireless cards License: Redistributable, no modification permitted Group: Base/Kernel %description -n brcm-firmware -Firmware for the Broadcom 802.11 wireless cards +Firmware for Broadcom 802.11 wireless cards %package -n cavium-firmware -Summary: Firmware for the Cavium crypto and Ethernet adapters +Summary: Firmware for Cavium crypto and Ethernet adapters License: Redistributable, no modification permitted Group: Base/Kernel %description -n cavium-firmware -Firmware for the Cavium crypto and Ethernet adapters +Firmware for Cavium crypto and Ethernet adapters + +%package -n chelsio-firmware +Summary: Firmware for Chelsio T3/T4/T5/T6 +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n chelsio-firmware +Firmware for Chelsio T3/T4/T5/T6 %package -n intel-sound-firmware -Summary: Firmware for the Intel sound cards +Summary: Firmware for Intel sound cards License: Redistributable, no modification permitted Group: Base/Kernel %description -n intel-sound-firmware -Firmware for the Intel sound cards +Firmware for Intel sound cards %package -n intel-bluetooth-firmware -Summary: Firmware for the Intel Bluetooth adapters +Summary: Firmware for Intel Bluetooth adapters License: Redistributable, no modification permitted Group: Base/Kernel %description -n intel-bluetooth-firmware -Firmware for the Intel Bluetooth adapters +Firmware for Intel Bluetooth adapters %package -n iwl100-firmware Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters @@ -296,57 +312,32 @@ drivers for Linux. Usage of the firmware is subject to the terms and conditions contained inside the provided LICENSE file. Please read it carefully. -%package -n libertas-usb8388-firmware -Summary: Firmware for Marvell Libertas USB 8388 Network Adapter -License: Redistributable, no modification permitted -Group: Base/Kernel - -%description -n libertas-usb8388-firmware -Firmware for Marvell Libertas USB 8388 Network Adapter - -%package -n libertas-usb8388-olpc-firmware -Summary: OLPC firmware for Marvell Libertas USB 8388 Network Adapter -License: Redistributable, no modification permitted -Group: Base/Kernel - -%description -n libertas-usb8388-olpc-firmware -Firmware for Marvell Libertas USB 8388 Network Adapter with OLPC mesh -network support. - -%package -n libertas-sd8686-firmware -Summary: Firmware for Marvell Libertas SD 8686 Network Adapter -License: Redistributable, no modification permitted -Group: Base/Kernel - -%description -n libertas-sd8686-firmware -Firmware for Marvell Libertas SD 8686 Network Adapter - -%package -n libertas-sd8787-firmware -Summary: Firmware for Marvell Libertas SD 8787 Network Adapter +%package -n libertas-firmware +Summary: Firmware for Marvell wirelsess network cards License: Redistributable, no modification permitted Group: Base/Kernel -%description -n libertas-sd8787-firmware -Firmware for Marvell Libertas SD 8787 Network Adapter +%description -n libertas-firmware +Firmware for Marvell wireless network cards %package -n netronome-firmware -Summary: Firmware for the Netronome Smart NICs +Summary: Firmware for Netronome Smart NICs License: Redistributable, no modification permitted Group: Base/Kernel %description -n netronome-firmware -Firmware for the Netronome Smart NICs +Firmware for Netronome Smart NICs %package -n nvidia-gpu-firmware -Summary: Firmware for the NVIDIA graphics chips +Summary: Firmware for NVIDIA graphics chips License: Redistributable, no modification permitted Group: Base/Kernel %description -n nvidia-gpu-firmware -Firmware for the NVIDIA graphics chips +Firmware for NVIDIA graphics chips %package -n qlogic-firmware -Summary: Firmware for the QLogic adapters +Summary: Firmware for QLogic adapters License: Redistributable, no modification permitted Group: Base/Kernel @@ -354,6 +345,14 @@ Group: Base/Kernel This package contains the binary firmware for QLogic Infiniband, SCSI, Fibre Channel/FCoE adapters and Converged Network Adapters +%package -n ti-connectivity-firmware +Summary: Firmware for Texas Instruments wireless network chips +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n ti-connectivity-firmware +Firmware for Texas Instruments wireless network chips + %define no_install_post_strip 1 %prep @@ -386,17 +385,8 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/advansys /lib/firmware/agere_*_fw.bin /lib/firmware/amd-ucode -/lib/firmware/ar3k -/lib/firmware/ar5523.bin -/lib/firmware/ar7010*.fw -/lib/firmware/ar9170-*.fw -/lib/firmware/ar9271.fw /lib/firmware/as102_data1_st.hex /lib/firmware/as102_data2_st.hex -/lib/firmware/ath10k -/lib/firmware/ath3k-1.fw -/lib/firmware/ath6k -/lib/firmware/ath9k_htc /lib/firmware/atmel /lib/firmware/atmsar11.fw /lib/firmware/atusb @@ -407,8 +397,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/cpia2 /lib/firmware/ctefx.bin /lib/firmware/ctspeq.bin -/lib/firmware/cxgb3 -/lib/firmware/cxgb4 /lib/firmware/dabusb /lib/firmware/dsp56k /lib/firmware/dvb-fe-xc4000-*.fw @@ -448,24 +436,14 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/keyspan /lib/firmware/keyspan_pda /lib/firmware/korg/k1212.dsp -/lib/firmware/lbtf_usb.bin /lib/firmware/lgs8g75.fw -/lib/firmware/libertas -%exclude /lib/firmware/libertas/usb8388_v9.bin -%exclude /lib/firmware/libertas/sd8686* -%exclude /lib/firmware/libertas/usb8388_olpc.bin /lib/firmware/matrox /lib/firmware/mellanox /lib/firmware/moxa -/lib/firmware/mrvl -%exclude /lib/firmware/mrvl/sd8787* -/lib/firmware/mrvl/sd8787* /lib/firmware/mt7601u.bin /lib/firmware/mt7650.bin /lib/firmware/mt7662*.bin /lib/firmware/mts_*.fw -/lib/firmware/mwl8k -/lib/firmware/mwlwifi /lib/firmware/myri10ge_*.dat /lib/firmware/myricom /lib/firmware/ositech @@ -521,7 +499,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/tehuti /lib/firmware/ti_3410.fw /lib/firmware/ti_5052.fw -/lib/firmware/ti-connectivity /lib/firmware/tigon /lib/firmware/ti-keystone /lib/firmware/tlg2300_firmware.bin @@ -552,6 +529,19 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/r128 /lib/firmware/radeon +%files -n atheros-firmware +%defattr(644,root,root,755) +%doc WHENCE LICENCE.atheros_firmware +/lib/firmware/ar3k +/lib/firmware/ar5523.bin +/lib/firmware/ar7010*.fw +/lib/firmware/ar9170-*.fw +/lib/firmware/ar9271.fw +/lib/firmware/ath10k +/lib/firmware/ath3k-1.fw +/lib/firmware/ath6k +/lib/firmware/ath9k_htc + %files -n bnx2-firmware %defattr(644,root,root,755) %doc WHENCE @@ -575,9 +565,16 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/cavium /lib/firmware/liquidio +%files -n chelsio-firmware +%defattr(644,root,root,755) +%doc WHENCE LICENCE.chelsio_firmware +/lib/firmware/cxgb3 +/lib/firmware/cxgb4 + %files -n intel-sound-firmware %defattr(644,root,root,755) %doc WHENCE +%dir /lib/firmware/intel /lib/firmware/intel/IntcSST2.bin /lib/firmware/intel/dsp_fw_* /lib/firmware/intel/fw_sst_* @@ -585,6 +582,7 @@ rm -rf $RPM_BUILD_ROOT %files -n intel-bluetooth-firmware %defattr(644,root,root,755) %doc WHENCE LICENCE.ibt_firmware +%dir /lib/firmware/intel /lib/firmware/intel/ibt-* %files -n iwl100-firmware @@ -690,29 +688,14 @@ rm -rf $RPM_BUILD_ROOT %doc WHENCE LICENCE.iwlwifi_firmware /lib/firmware/iwlwifi-9260-*.ucode -%files -n libertas-usb8388-firmware -%defattr(644,root,root,755) -%doc WHENCE LICENCE.Marvell -%dir /lib/firmware/libertas -/lib/firmware/libertas/usb8388_v9.bin - -%files -n libertas-usb8388-olpc-firmware -%defattr(644,root,root,755) -%doc WHENCE LICENCE.Marvell -%dir /lib/firmware/libertas -/lib/firmware/libertas/usb8388_olpc.bin - -%files -n libertas-sd8686-firmware -%defattr(644,root,root,755) -%doc WHENCE LICENCE.Marvell -%dir /lib/firmware/libertas -/lib/firmware/libertas/sd8686* - -%files -n libertas-sd8787-firmware +%files -n libertas-firmware %defattr(644,root,root,755) %doc WHENCE LICENCE.Marvell -%dir /lib/firmware/mrvl -/lib/firmware/mrvl/sd8787* +/lib/firmware/lbtf_usb.bin +/lib/firmware/libertas +/lib/firmware/mrvl +/lib/firmware/mwl8k +/lib/firmware/mwlwifi %files -n netronome-firmware %defattr(644,root,root,755) @@ -738,3 +721,8 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/ql2322_fw.bin /lib/firmware/ql2400_fw.bin /lib/firmware/ql2500_fw.bin + +%files -n ti-connectivity-firmware +%defattr(644,root,root,755) +%doc WHENCE +/lib/firmware/ti-connectivity -- 2.44.0