diff --git a/.gitignore b/.gitignore index f82bd6c..1179945 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/linux-firmware-20190516.tar.xz +SOURCES/linux-firmware-20191202.tar.xz diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index ccead55..ac30c2a 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1 +1 @@ -b4d2de328ccd9085fcade8052769322ebe0ee9b1 SOURCES/linux-firmware-20190516.tar.xz +5bbc9ab540f78628fd8966369e12e99492e669f8 SOURCES/linux-firmware-20191202.tar.xz diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index 957aa6b..2bef530 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,11 +1,11 @@ -%global checkout 711d3297 -%global firmware_release 94 +%global checkout e8a0f4c9 +%global firmware_release 97 %global _firmwarepath /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 Name: linux-firmware -Version: 20190516 +Version: 20191202 Release: %{firmware_release}.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted @@ -38,7 +38,7 @@ Conflicts: microcode_ctl < 2.1-0 # avoid upgrade errors (see bug 1589055) Obsoletes: ivtv-firmware < 2:20080701-28 -BuildRequires: git +BuildRequires: git make %description This package includes firmware files required for some devices to @@ -270,6 +270,13 @@ git am %{patches} %endif %build + +%install +mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath} +mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath}/updates +make DESTDIR=%{buildroot}/ FIRMWAREDIR=%{_firmwarepath} install + +pushd $RPM_BUILD_ROOT/%{_firmwarepath} # Remove firmware shipped in separate packages already # Perhaps these should be built as subpackages of linux-firmware? rm -rf ess korg sb16 yamaha @@ -286,17 +293,13 @@ rm -f libertas/usb8388_v5.bin # Remove firmware for Creative CA0132 HD as it's in alsa-firmware rm -f ctefx.bin ctspeq.bin -# Remove the check_whence.py file -rm -f check_whence.py - # Remove cxgb3 (T3 adapter) firmware (see bug 1503721) rm -rf cxgb3 -%install -mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath} -mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath}/updates -cp -r * $RPM_BUILD_ROOT/%{_firmwarepath} -rm $RPM_BUILD_ROOT/%{_firmwarepath}/{WHENCE,LICENCE.*,LICENSE.*} +# Remove superfluous infra files +rm -f check_whence.py configure Makefile README + +popd # Create file list but exclude firmwares that we place in subpackages # and netronome/nic_AMDA* symlinks @@ -388,6 +391,7 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_firmwarepath}/iwlwifi-9000-*.ucode %{_firmwarepath}/iwlwifi-9260-*.ucode %{_firmwarepath}/iwlwifi-cc-a0-*.ucode +%{_firmwarepath}/iwlwifi-Qu*.ucode %files -n libertas-usb8388-firmware %license WHENCE LICENCE.Marvell @@ -411,10 +415,28 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %files -f linux-firmware.files %dir %{_firmwarepath} -%license WHENCE LICENCE.* LICENSE.* +%license WHENCE LICENCE.* %config(noreplace) %{_firmwarepath}/netronome/nic_AMDA* %changelog +* Thu Dec 12 2019 Bruno Meneguele - 20191202-97.gite8a0f4c9 +- firmware files marked as configuration files (rhbz 1782329) + +* Mon Dec 02 2019 Bruno Meneguele - 20191202-96.gite8a0f4c9 +- Fix .files file dir, wrongly modified in the last release + +* Mon Dec 02 2019 Bruno Meneguele - 20191202-95.gite8a0f4c9 +- Update to latest upstream linux-firmware image for assorted updates +- Update qed zipped/unzipped firmware to latest upstream (rhbz 1720394) +- Update bnx2x firmware to latest upstream (rhbz 1720395) +- AX200(Cyclone Peak 2 or CcP2) Bluetooth support (rhbz 1722693) +- Firmware for Chelsio T4/T5/T6 adapters (rhbz 1725821) +- Include to support Intel AX201 Harrison Peak(CNVi) on CML-U (rhbz 1725873) +- Icelake Bluetooth firmware update (AX201, Harrison Peak, or HrP2) (rhbz 1726182) +- DDP Package to support Columbiaville NIC (rhbz 1726454) +- Add iwlwifi-cc-a0-48.ucode to linux-firmware (rhbz 1753962) +- Change install section to use usptream installation process + * Thu May 16 2019 Herton R. Krzesinski - 20190516-94.git711d3297 - Update to latest upstream linux-firmware image for assorted updates - Update iwlwifi firmware to support the Cyclone Peak Dual Band 2x2 802.11ax (rhbz 1622442)