- updated to 20160321, include all firmware that previously was

  available in separate packages

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 45c523270b4b166792e7a781a49a12b841bb90c9..6ec3b6285ae6ee8eebb86f95e7e714f146e56d93 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -3,12 +3,12 @@
 Summary:       Firmware files used by the Linux kernel
 Summary(pl.UTF-8):     Pliki firmware'u używane przez jądro Linuksa
 Name:          linux-firmware
-Version:       20151214
+Version:       20160321
 Release:       1
 License:       GPL+ and GPL v2+ and MIT and Redistributable, no modification permitted
 Group:         Base/Kernel
-Source0:       http://pkgs.fedoraproject.org/repo/pkgs/linux-firmware/%{name}-%{version}.tar.gz/b5195b4ff4fdf0caae96990761e0bd88/%{name}-%{version}.tar.gz
-# Source0-md5: b5195b4ff4fdf0caae96990761e0bd88
+Source0:       http://pkgs.fedoraproject.org/repo/pkgs/linux-firmware/%{name}-%{version}.tar.gz/46a7ec26850851c9da93ba84dd14fc71/%{name}-%{version}.tar.gz
+# Source0-md5: 46a7ec26850851c9da93ba84dd14fc71
 URL:           http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 BuildArch:     noarch
 Obsoletes:     microcode-data-amd
@@ -28,32 +28,8 @@ mv linux-firmware-*/* .
 rmdir linux-firmware-*
 
 %build
-# Remove firmware shipped in separate packages already
-# Perhaps these should be built as subpackages of linux-firmware?
-# - ql{2100,2200,2300,2322,2400,2500}-firmware.spec
-%{__rm} ql{2100,2200,2300,2322,2400,2500}_fw.bin LICENCE.qla2xxx
-# - iwlwifi-{1000,3945,4965,5000,5150,6000,6030,7260}-ucode.spec
-%{__rm} iwlwifi-{1000-5,3945-[12],4965-[12],5000-[125],5150-2,6000-4,6000g2b-6,7260-{7,8,9,10,12,13}}.ucode
-# (note: LICENCE.iwlwifi_firmware left for remaining iwlwifi files)
-# - obsolete versions of iwlwifi firmwares
-%{__rm} iwlwifi-{1000-3,6000g2a-5,6000g2b-5,6050-4}.ucode
 # - alsa-firmware.spec
 %{__rm} -r ess korg sb16 yamaha
-# We have _some_ ralink firmware in separate packages already. (which packages???)
-%{__rm} rt73.bin rt2561.bin rt2561s.bin rt2661.bin
-# And _some_ conexant firmware. (which packages???)
-%{__rm} v4l-cx23418-apu.fw v4l-cx23418-cpu.fw v4l-cx23418-dig.fw v4l-cx25840.fw
-# Netxen firmware (which package???)
-%{__rm} phanfw.bin LICENCE.phanfw
-# - radeon-ucode.spec
-%{__rm} radeon/{ARUBA,BARTS,BONAIRE,BTC,CAICOS,CAYMAN,CEDAR,CYPRESS,HAINAN,HAWAII,JUNIPER,KABINI,KAVERI,MULLINS,OLAND,PALM,PITCAIRN,R700,REDWOOD,SUMO,SUMO2,TAHITI,TURKS,VERDE,bonaire,hainan,hawaii,kabini,kaveri,mullins,oland,pitcairn,tahiti,verde}_*.bin
-# R{100,200,300,420,520}_cp.bin, R600_{me,pfp}.bin, RS{600,690}_cp.bin, RS780_{me,pfp}.bin, RV610_{me,pfp}.bin RV620_{me,pfp}.bin, RV630_{me,pfp}.bin, RV635_{me,pfp}.bin, RV710-{me,pfp}.bin, RV730_{me,pfp}.bin RV770_{me,pfp}.bin are missing in radeon_ucode
-%{__rm} radeon/R600_{rlc,uvd}.bin
-%{__rm} radeon/RS780_uvd.bin
-%{__rm} radeon/RV710_{smc,uvd}.bin
-%{__rm} radeon/RV730_smc.bin
-%{__rm} radeon/RV740_smc.bin
-%{__rm} radeon/RV770_{smc,uvd}.bin
 
 # Remove source files we don't need to install
 %{__rm} */*.asm dsp56k/{Makefile,concat-bootstrap.pl} isci/{Makefile,README,*.[ch]}
@@ -144,6 +120,8 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/iwlwifi-100-5.ucode
 /lib/firmware/iwlwifi-105-6.ucode
 /lib/firmware/iwlwifi-135-6.ucode
+/lib/firmware/iwlwifi-1000-3.ucode
+/lib/firmware/iwlwifi-1000-5.ucode
 /lib/firmware/iwlwifi-2000-6.ucode
 /lib/firmware/iwlwifi-2030-6.ucode
 /lib/firmware/iwlwifi-3160-7.ucode
@@ -153,8 +131,26 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/iwlwifi-3160-12.ucode
 /lib/firmware/iwlwifi-3160-13.ucode
 /lib/firmware/iwlwifi-3160-16.ucode
+/lib/firmware/iwlwifi-3168-21.ucode
+/lib/firmware/iwlwifi-3945-2.ucode
+/lib/firmware/iwlwifi-4965-2.ucode
+/lib/firmware/iwlwifi-5000-1.ucode
+/lib/firmware/iwlwifi-5000-2.ucode
+/lib/firmware/iwlwifi-5000-5.ucode
+/lib/firmware/iwlwifi-5150-2.ucode
+/lib/firmware/iwlwifi-6000-4.ucode
+/lib/firmware/iwlwifi-6000g2a-5.ucode
 /lib/firmware/iwlwifi-6000g2a-6.ucode
+/lib/firmware/iwlwifi-6000g2b-5.ucode
+/lib/firmware/iwlwifi-6000g2b-6.ucode
+/lib/firmware/iwlwifi-6050-4.ucode
 /lib/firmware/iwlwifi-6050-5.ucode
+/lib/firmware/iwlwifi-7260-7.ucode
+/lib/firmware/iwlwifi-7260-8.ucode
+/lib/firmware/iwlwifi-7260-9.ucode
+/lib/firmware/iwlwifi-7260-10.ucode
+/lib/firmware/iwlwifi-7260-12.ucode
+/lib/firmware/iwlwifi-7260-13.ucode
 /lib/firmware/iwlwifi-7260-16.ucode
 /lib/firmware/iwlwifi-7265-8.ucode
 /lib/firmware/iwlwifi-7265-9.ucode
@@ -166,8 +162,11 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/iwlwifi-7265D-12.ucode
 /lib/firmware/iwlwifi-7265D-13.ucode
 /lib/firmware/iwlwifi-7265D-16.ucode
+/lib/firmware/iwlwifi-7265D-21.ucode
 /lib/firmware/iwlwifi-8000C-13.ucode
 /lib/firmware/iwlwifi-8000C-16.ucode
+/lib/firmware/iwlwifi-8000C-21.ucode
+/lib/firmware/iwlwifi-8265-21.ucode
 /lib/firmware/kaweth
 /lib/firmware/keyspan
 /lib/firmware/keyspan_pda
@@ -187,10 +186,22 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/myricom
 /lib/firmware/nvidia
 /lib/firmware/ositech
+/lib/firmware/phanfw.bin
 /lib/firmware/qat_895xcc.bin
+/lib/firmware/qat_895xcc_mmp.bin
+/lib/firmware/qat_c3xxx.bin
+/lib/firmware/qat_c3xxx_mmp.bin
+/lib/firmware/qat_c62x.bin
+/lib/firmware/qat_c62x_mmp.bin
 /lib/firmware/qat_mmp.bin
 /lib/firmware/qca
 /lib/firmware/qed
+/lib/firmware/ql2100_fw.bin
+/lib/firmware/ql2200_fw.bin
+/lib/firmware/ql2300_fw.bin
+/lib/firmware/ql2322_fw.bin
+/lib/firmware/ql2400_fw.bin
+/lib/firmware/ql2500_fw.bin
 /lib/firmware/qlogic
 /lib/firmware/r128
 /lib/firmware/r8a779x_usb3_v1.dlmem
@@ -198,12 +209,16 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/radeon
 /lib/firmware/rp2.fw
 /lib/firmware/rsi_91x.fw
+/lib/firmware/rt2561.bin
+/lib/firmware/rt2561s.bin
+/lib/firmware/rt2661.bin
 /lib/firmware/rt2860.bin
 /lib/firmware/rt2870.bin
 /lib/firmware/rt3070.bin
 /lib/firmware/rt3071.bin
 /lib/firmware/rt3090.bin
 /lib/firmware/rt3290.bin
+/lib/firmware/rt73.bin
 /lib/firmware/rtl_bt
 /lib/firmware/rtl_nic
 /lib/firmware/rtlwifi