X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=linux-firmware.spec;h=21b98afb1dfbdd23f81e664817a9255d26ee6a98;hb=a5a250cdab646c13b4010b257c5c4dd167d9ce7f;hp=986e1eccc3b30c9ae9339b7a72a5de2bc6eb9ac1;hpb=492ffa88bbab2719d902ec3abef681e2de727c43;p=packages%2Flinux-firmware.git

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 986e1ec..21b98af 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,5 +1,5 @@
-%define		rel	2
-%define		ver	20190514
+%define		rel	1
+%define		ver	20200519
 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,10 +7,16 @@ 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/6de58e28892b06d88a74750957596eb17227a684a9603ff29a01f3c5712f40a79128aec3a94dfb71d0cfabd918a9add4216d4f8e9ef91c5c40859fb160422685/linux-firmware-%{version}.tar.xz
-# Source0-md5:	cb27c6f0348b45794ca1af7309d8632c
+# 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:	04968ac1bc835ca142359e28df4a901d
 URL:		https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
-Obsoletes:	microcode-data-amd
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	microcode-data-amd
+Requires:	microcode-data-intel
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -160,6 +166,17 @@ drivers for Linux to support the iwl2030 hardware. Usage of the
 firmware is subject to the terms and conditions contained inside the
 provided LICENSE file. Please read it carefully.
 
+%package -n iwl22000-firmware
+Summary:	Firmware for Intel(R) Centrino Wireless-N 22000 Series Adapters
+License:	Redistributable, no modification permitted
+Group:		Base/Kernel
+
+%description -n iwl22000-firmware
+This package contains the firmware required by the Intel wireless
+drivers for Linux to support the iwl22000 hardware. Usage of the
+firmware is subject to the terms and conditions contained inside the
+provided LICENSE file. Please read it carefully.
+
 %package -n iwl22260-firmware
 Summary:	Firmware for Intel(R) Centrino Wireless-N 22260 Series Adapters
 License:	Redistributable, no modification permitted
@@ -381,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
@@ -389,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
@@ -438,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
@@ -470,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
@@ -486,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
@@ -496,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
@@ -527,8 +541,6 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/v4l-cx*.fw
 /lib/firmware/vicam
 /lib/firmware/vntwusb.fw
-/lib/firmware/vpu_d.bin
-/lib/firmware/vpu_p.bin
 /lib/firmware/vxge
 /lib/firmware/whiteheat*.fw
 /lib/firmware/wil6210.brd
@@ -634,6 +646,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/iwlwifi-2030-*.ucode
 
+%files -n iwl22000-firmware
+%defattr(644,root,root,755)
+%doc WHENCE LICENCE.iwlwifi_firmware
+/lib/firmware/iwlwifi-Qu-*.ucode
+/lib/firmware/iwlwifi-QuZ-*.ucode
+
 %files -n iwl22260-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware