- PLD merge

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 5b133cfac5ef0c257322a9f213a63d522595f588..8e776a8b9733828bb435f897a42207bc293dc998 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,14 +1,15 @@
 # TODO
 # - subpackages for various firmwares?
+# - build microcode-data-amd from this spec?
 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:       20140912
+Version:       20150715
 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/540773f0415d116724be844787331847/%{name}-%{version}.tar.gz
-# Source0-md5: 540773f0415d116724be844787331847
+Source0:       http://pkgs.fedoraproject.org/repo/pkgs/linux-firmware/%{name}-%{version}.tar.gz/5f829e860b1b9b5f6ea1a385eb368540/%{name}-%{version}.tar.gz
+# Source0-md5: 5f829e860b1b9b5f6ea1a385eb368540
 URL:           http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,7 +33,7 @@ rmdir 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}}.ucode
+%{__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
@@ -40,18 +41,30 @@ rmdir linux-firmware-*
 %{__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. (whcih packages???)
+# 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,BTC,CAYMAN,CEDAR,CYPRESS,JUNIPER,PITCAIRN,R700,REDWOOD,SUMO,TAHITI,VERDE}_rlc.bin
+%{__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
+# - microcode-data-amd (TODO: build it from this spec?)
+%{__rm} amd-ucode/microcode_amd{,_fam15h}.bin
 
 # 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
 
+# and signatures
+%{__rm} amd-ucode/*.asc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/lib/firmware
@@ -70,7 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/adaptec
 /lib/firmware/advansys
 /lib/firmware/agere_*_fw.bin
-/lib/firmware/amd-ucode
+# XXX: dir shared with microcode-data-amd
+%dir /lib/firmware/amd-ucode
+/lib/firmware/amd-ucode/microcode_amd_fam16h.bin
 /lib/firmware/ar3k
 /lib/firmware/ar5523.bin
 /lib/firmware/ar7010*.fw
@@ -80,7 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/as102_data2_st.hex
 /lib/firmware/ath3k-1.fw
 /lib/firmware/ath6k
+/lib/firmware/ath9k_htc
+/lib/firmware/ath10k
 /lib/firmware/atmsar11.fw
+/lib/firmware/atusb
 /lib/firmware/av7110
 /lib/firmware/bnx2
 /lib/firmware/bnx2x
@@ -90,6 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/carl9170-1.fw
 /lib/firmware/cbfw-*.bin
 /lib/firmware/cis
+/lib/firmware/cmmb_*_12mhz.inp
 /lib/firmware/cpia2
 /lib/firmware/ct2fw-*.bin
 /lib/firmware/ctefx.bin
@@ -106,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/dvb-usb-it9135-01.fw
 /lib/firmware/dvb-usb-it9135-02.fw
 /lib/firmware/dvb-usb-terratec-h5-drxk.fw
+/lib/firmware/dvb_nova_12mhz*.inp
 /lib/firmware/e100
 /lib/firmware/edgeport
 /lib/firmware/emi26
@@ -117,8 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/htc_9271.fw
 /lib/firmware/i2400m-fw-usb-*.sbcf
 /lib/firmware/i6050-fw-usb-*.sbcf
+/lib/firmware/i915
 /lib/firmware/intel
 /lib/firmware/intelliport2.bin
+/lib/firmware/isdbt_*.inp
 /lib/firmware/isci
 /lib/firmware/iwlwifi-100-5.ucode
 /lib/firmware/iwlwifi-105-6.ucode
@@ -128,16 +150,27 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/iwlwifi-3160-7.ucode
 /lib/firmware/iwlwifi-3160-8.ucode
 /lib/firmware/iwlwifi-3160-9.ucode
+/lib/firmware/iwlwifi-3160-10.ucode
+/lib/firmware/iwlwifi-3160-12.ucode
+/lib/firmware/iwlwifi-3160-13.ucode
 /lib/firmware/iwlwifi-6000g2a-6.ucode
 /lib/firmware/iwlwifi-6050-5.ucode
 /lib/firmware/iwlwifi-7265-8.ucode
 /lib/firmware/iwlwifi-7265-9.ucode
+/lib/firmware/iwlwifi-7265-10.ucode
+/lib/firmware/iwlwifi-7265-12.ucode
+/lib/firmware/iwlwifi-7265-13.ucode
+/lib/firmware/iwlwifi-7265D-10.ucode
+/lib/firmware/iwlwifi-7265D-12.ucode
+/lib/firmware/iwlwifi-7265D-13.ucode
+/lib/firmware/iwlwifi-8000C-13.ucode
 /lib/firmware/kaweth
 /lib/firmware/keyspan
 /lib/firmware/keyspan_pda
 /lib/firmware/lbtf_usb.bin
 /lib/firmware/lgs8g75.fw
 /lib/firmware/libertas
+/lib/firmware/liquidio
 /lib/firmware/matrox
 /lib/firmware/moxa
 /lib/firmware/mrvl
@@ -146,8 +179,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/mwl8k
 /lib/firmware/myri10ge_*.dat
 /lib/firmware/myricom
+/lib/firmware/nvidia
 /lib/firmware/ositech
 /lib/firmware/qat_895xcc.bin
+/lib/firmware/qca
 /lib/firmware/qlogic
 /lib/firmware/r128
 /lib/firmware/r8a779x_usb3_v1.dlmem
@@ -160,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/rt3071.bin
 /lib/firmware/rt3090.bin
 /lib/firmware/rt3290.bin
+/lib/firmware/rtl_bt
 /lib/firmware/rtl_nic
 /lib/firmware/rtlwifi
 /lib/firmware/s2250*.fw
@@ -170,8 +206,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/s5p-mfc.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/ti-connectivity
 /lib/firmware/ti_3410.fw