diff --git a/.gitignore b/.gitignore index 59324cb..b364469 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/linux-firmware-20190429.tar.gz +SOURCES/linux-firmware-20191203.tar.gz diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index 987974e..820a6fb 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1 +1 @@ -b9dbf694656dacf56a5eb3ad052ad1eb7a93529e SOURCES/linux-firmware-20190429.tar.gz +84ac3833694faf2b25c1dfe36fdd7eb56990e284 SOURCES/linux-firmware-20191203.tar.gz diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index dc8b32a..cf5aac0 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,8 +1,8 @@ -%global checkout ddde598 -%global firmware_release 72 +%global checkout e8a0f4c +%global firmware_release 76 Name: linux-firmware -Version: 20190429 +Version: 20191203 Release: %{firmware_release}.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel @@ -31,6 +31,8 @@ Obsoletes: libertas-sd8686-firmware Obsoletes: libertas-sd8787-firmware Obsoletes: libertas-usb8388-olpc-firmware +BuildRequires: git make + %define fwdir /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 @@ -110,7 +112,7 @@ LICENSE file. Please read it carefully. %package -n iwl3160-firmware Summary: Firmware for Intel(R) Dual Band Wireless-AC 3160 Series Adapters License: Redistributable, no modification permitted -Version: 22.0.7.0 +Version: 25.30.13.0 Release: %{firmware_release}%{?dist} %description -n iwl3160-firmware This package contains the firmware required by the iwlagn driver @@ -176,7 +178,7 @@ contained inside the provided LICENSE file. Please read it carefully. %package -n iwl6000g2a-firmware Summary: Firmware for Intel(R) Wireless WiFi Link 6005 Series Adapters License: Redistributable, no modification permitted -Version: 17.168.5.3 +Version: 18.168.6.1 Release: %{firmware_release}%{?dist} Obsoletes: iwl6000g2a-firmware < 17.168.5.3-3 %description -n iwl6000g2a-firmware @@ -187,7 +189,7 @@ contained inside the provided LICENSE file. Please read it carefully. %package -n iwl6000g2b-firmware Summary: Firmware for Intel(R) Wireless WiFi Link 6030 Series Adapters License: Redistributable, no modification permitted -Version: 17.168.5.2 +Version: 18.168.6.1 Release: %{firmware_release}%{?dist} Obsoletes: iwl6000g2b-firmware < 17.168.5.2-3 %description -n iwl6000g2b-firmware @@ -207,30 +209,30 @@ for Linux. Usage of the firmware is subject to the terms and conditions contained inside the provided LICENSE file. Please read it carefully. %package -n iwl7260-firmware -Summary: Firmware for Intel(R) Dual Band Wireless-AC 7260 Series Adapters +Summary: Firmware for Intel(R) Wireless WiFi Link 726x/8000/9000 Series Adapters License: Redistributable, no modification permitted -Version: 22.0.7.0 +Version: 25.30.13.0 Release: %{firmware_release}%{?dist} +Obsoletes: iwl7265-firmware %description -n iwl7260-firmware This package contains the firmware required by the iwlagn driver for Linux. Usage of the firmware is subject to the terms and conditions contained inside the provided LICENSE file. Please read it carefully. -%package -n iwl7265-firmware -Summary: Firmware for Intel(R) Dual Band Wireless-AC 7265 Series Adapters -License: Redistributable, no modification permitted -Version: 22.0.7.0 -Release: %{firmware_release}%{?dist} -%description -n iwl7265-firmware -This package contains the firmware required by the iwlagn driver -for Linux. Usage of the firmware is subject to the terms and conditions -contained inside the provided LICENSE file. Please read it carefully. - %prep # Setup Source0 %setup -q -c -n linux-firmware-%{checkout} %build + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{fwdir} +mkdir -p $RPM_BUILD_ROOT%{fwdir}/updates +make DESTDIR=$RPM_BUILD_ROOT/ FIRMWAREDIR=%{fwdir} install + +pushd $RPM_BUILD_ROOT/%{fwdir} + # Remove firmware shipped in separate packages already # Perhaps these should be built as subpackages of linux-firmware? rm -rf ess korg sb16 yamaha @@ -255,15 +257,9 @@ rm -f i6050-fw-usb-1.5.sbcf # Remove images for vxge, we do not provide that driver in RHEL7 kernel rm -rf vxge -# Remove the check_whence.py file -rm -f check_whence.py +rm -f check_whence.py configure Makefile README -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{fwdir} -mkdir -p $RPM_BUILD_ROOT%{fwdir}/updates -cp -r * $RPM_BUILD_ROOT%{fwdir} -rm $RPM_BUILD_ROOT%{fwdir}/{WHENCE,LICENCE.*,LICENSE.*} +popd # Create file list but exclude firmwares that we place in subpackages FILEDIR=`pwd` @@ -372,10 +368,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware %{fwdir}/iwlwifi-7260-*.ucode - -%files -n iwl7265-firmware -%defattr(-,root,root,-) -%doc WHENCE LICENCE.iwlwifi_firmware %{fwdir}/iwlwifi-7265-*.ucode %{fwdir}/iwlwifi-7265D-*.ucode # Following up Fedora on where they have included iwlwifi-8000C & iwlwifi-8265 blobs @@ -384,7 +376,9 @@ rm -rf $RPM_BUILD_ROOT # Following up Fedora on where they have included iwlwifi-9000C & iwlwifi-9260 blobs %{fwdir}/iwlwifi-9000-*.ucode %{fwdir}/iwlwifi-9260-*.ucode - +# Following up Fedora on where they have included iwlwifi-cc-a0* and iwlwifi-Qu* blobs +%{fwdir}/iwlwifi-cc-a0-*.ucode +%{fwdir}/iwlwifi-Qu*.ucode %files -f linux-firmware.files %defattr(-,root,root,-) @@ -393,6 +387,22 @@ rm -rf $RPM_BUILD_ROOT %doc WHENCE LICENCE.* LICENSE.* %changelog +* Tue Dec 17 2019 Jan Stancek - 20191203-76.gite8a0f4c +- Fix missing firmware symlinks (rhbz 1783196) + +* Tue Dec 3 2019 Jan Stancek - 20191203-75.gite8a0f4c +- Update to latest upstream linux-firmware image for assorted updates +- Update qed zipped/unzipped firmware to latest upstream (rhbz 1720385) + +* Wed Sep 18 2019 Jan Stancek - 20190918-74.git6c6918a +- Update to latest upstream linux-firmware image for assorted updates +- Update bnx2x firmware to latest upstream (rhbz 1720386) + +* Fri Aug 16 2019 Jan Stancek - 20190815-73.git07b925b +- Update to latest upstream linux-firmware image for assorted updates (rhbz 1741356) +- iwlwifi- Update to support the Cyclone Peak Dual Band 2x2 802.11ax +- iwl7265-firmware sub-package merged into iwl7260-firmware sub-package + * Mon Apr 29 2019 Bruno E. O. Meneguele - 20190429-72.gitddde598 - Update to latest upstream linux-firmware image for assorted updates - cxgb4: update firmware to revision 1.23.4.0 (rhbz 1690727)