- updated to 20191215, use official tarballs

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 23cf6b802d99f7a95edbf8e342831832549c60e6..15ff339997b83d96faddbc0b2214c32026318452 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,5 +1,5 @@
-%define                rel     2
-%define                ver     20190815
+%define                rel     1
+%define                ver     20191215
 Summary:       Firmware files used by the Linux kernel
 Summary(pl.UTF-8):     Pliki firmware'u używane przez jądro Linuksa
 Name:          linux-firmware
@@ -7,9 +7,14 @@ Version:       %{ver}
 Release:       %{rel}
 License:       GPL+ and GPL v2+ and MIT and Redistributable, no modification permitted
 Group:         Base/Kernel
-Source0:       https://src.fedoraproject.org/repo/pkgs/linux-firmware/%{name}-%{version}.tar.xz/sha512/6347b332de927186de71785198c46bf488a106ea56d3a5293f9075f3ddf3f25c2065eadd98f291efefd9140cca4a08f3af446e8147a49963d87d1ca177e6292e/linux-firmware-%{version}.tar.xz
-# Source0-md5: 65633818cb974a74ac6e31f2af390454
+# in case git snapshot is needed
+#Source0:      https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/%{name}-%{version}.tar.gz
+# upstream tarball
+Source0:       https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz
+# Source0-md5: 918e4f463fd7650a88655e484a5ffbd4
 URL:           https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires:      microcode-data-amd
 Requires:      microcode-data-intel
 BuildArch:     noarch
@@ -393,6 +398,8 @@ cp -a . $RPM_BUILD_ROOT/lib/firmware
 %{__rm} $RPM_BUILD_ROOT/lib/firmware/{GPL-2,GPL-3,LICENCE.*,LICENSE.*,README,TDA7706_OM_v*_boot.txt,WHENCE,check_whence.py}
 # For AMD CPU microcode see microcode-data-amd.spec
 %{__rm} -r $RPM_BUILD_ROOT/lib/firmware/amd-ucode
+# Symlink for ice package required by firmware and kernel driver
+ln -s $(basename $RPM_BUILD_ROOT/lib/firmware/intel/ice/ddp/ice-*.pkg) $RPM_BUILD_ROOT/lib/firmware/intel/ice/ddp/ice.pkg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -401,8 +408,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.* LICENSE.* README TDA7706_OM_v*_boot.txt
 /lib/firmware/3com
-/lib/firmware/a300_pfp.fw
-/lib/firmware/a300_pm4.fw
 /lib/firmware/acenic
 /lib/firmware/adaptec
 /lib/firmware/advansys
@@ -450,8 +455,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/i6050-fw-usb-*.sbcf
 /lib/firmware/i915
 /lib/firmware/imx
+/lib/firmware/inside-secure
 %dir /lib/firmware/intel
-/lib/firmware/intel/ipu3-fw.bin
+/lib/firmware/intel/ice
 /lib/firmware/intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
 /lib/firmware/intelliport2.bin
 /lib/firmware/isci
@@ -482,7 +488,6 @@ rm -rf $RPM_BUILD_ROOT
 /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/qcom
 /lib/firmware/r8a779x_usb3_v1.dlmem
@@ -498,9 +503,7 @@ rm -rf $RPM_BUILD_ROOT
 /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/RTL8192E
@@ -508,7 +511,6 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/rtl_nic
 /lib/firmware/rtlwifi
 /lib/firmware/rtw88
-/lib/firmware/s2250*.fw
 /lib/firmware/s5p-mfc.fw
 /lib/firmware/s5p-mfc-v6.fw
 /lib/firmware/s5p-mfc-v6-v2.fw