diff --git a/.gitignore b/.gitignore index 721e69f..04116a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/hfi1-fw-git44d8e8d.tar.gz -SOURCES/linux-firmware-20170606.tar.gz +SOURCES/linux-firmware-20180220.tar.gz diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index 156c35d..2e9bba4 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1,2 +1 @@ -7c598272a756a563e716560f185bbf04aed06f5e SOURCES/hfi1-fw-git44d8e8d.tar.gz -1b5325e3d5a2e6903c837315a285f6ecfd93d1af SOURCES/linux-firmware-20170606.tar.gz +b0466b12f531a41ad17eb82cf599cee74a898bf6 SOURCES/linux-firmware-20180220.tar.gz diff --git a/SOURCES/0001-Revert-Update-Intel-OPA-hfi1-firmware.patch b/SOURCES/0001-Revert-Update-Intel-OPA-hfi1-firmware.patch deleted file mode 100644 index fd021df..0000000 --- a/SOURCES/0001-Revert-Update-Intel-OPA-hfi1-firmware.patch +++ /dev/null @@ -1,18 +0,0 @@ -From d8c5e72f9a62201e86791ca3303605a598b010d0 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Rafael Aquini -Date: Fri, 23 Jun 2017 18:18:09 -0400 -Subject: [RHEL7 PATCH] Revert "Update Intel OPA hfi1 firmware" - -This reverts commit d3c5f65e593051568a0764eee04fc06106d341c0. -(partially reverts upstream commit -- blobs are reverted via spec source) - -diff --git a/WHENCE b/WHENCE -index 2d17e2e..f247e11 100644 ---- a/WHENCE -+++ b/WHENCE -@@ -3489,3 +3489,3 @@ Driver: hfi1 - Intel OPA Gen 1 adapter - File: hfi1_dc8051.fw --Version: 1.18 -+Version: 0.47 - File: hfi1_fabric.fw diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index 4057f47..f7aafc0 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,8 +1,8 @@ -%global checkout c990aae -%global firmware_release 58 +%global checkout 6d51311 +%global firmware_release 62 Name: linux-firmware -Version: 20170606 +Version: 20180220 Release: %{firmware_release}.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel @@ -31,16 +31,13 @@ Obsoletes: libertas-sd8686-firmware Obsoletes: libertas-sd8787-firmware Obsoletes: libertas-usb8388-olpc-firmware +# REDHAT-DISCLAIMER on u-code updates (rhbz 1533945) +Requires(post): coreutils +Source1: REDHAT-DISCLAIMER + %define fwdir /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 -# RHBZ 1464629 (reverts rhbz 1452253) -Source1: hfi1-fw-git44d8e8d.tar.gz -Patch0: 0001-Revert-Update-Intel-OPA-hfi1-firmware.patch - -# REDHAT-DISCLAIMER on u-code updates (rhbz 1533989) -Source2: REDHAT-DISCLAIMER - %description Kernel-firmware includes firmware files required for some devices to operate. @@ -234,10 +231,8 @@ 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 and additional Source1 -%setup -q -a 1 -c -n linux-firmware-%{checkout} -# RHBZ 1464629 (reverts rhbz 1452253) -%patch0 -p1 -b .bz1464629 +# Setup Source0 +%setup -q -c -n linux-firmware-%{checkout} %build # Remove firmware shipped in separate packages already @@ -267,8 +262,8 @@ rm -rf vxge # Remove the check_whence.py file rm -f check_whence.py -# REDHAT-DISCLAIMER on u-code updates (rhbz 1533989) -install %{SOURCE2} ./ +# REDHAT-DISCLAIMER on u-code updates +install %{SOURCE1} ./ %install rm -rf $RPM_BUILD_ROOT @@ -301,7 +296,9 @@ fi # also paste it over dmesg (some customers drop dmesg messages while # others keep them into /var/log for the later case, we'll have the # disclaimer recorded twice into system logs. -cat %{fwdir}/REDHAT-DISCLAIMER > /dev/kmsg +if [ -e /usr/bin/cat ]; then + /usr/bin/cat %{fwdir}/REDHAT-DISCLAIMER > /dev/kmsg +fi %files -n iwl100-firmware @@ -393,6 +390,10 @@ cat %{fwdir}/REDHAT-DISCLAIMER > /dev/kmsg # Following up Fedora on where they have included iwlwifi-8000C & iwlwifi-8265 blobs %{fwdir}/iwlwifi-8000C-*.ucode %{fwdir}/iwlwifi-8265-*.ucode +# Following up Fedora on where they have included iwlwifi-9000C & iwlwifi-9260 blobs +%{fwdir}/iwlwifi-9000-*.ucode +%{fwdir}/iwlwifi-9260-*.ucode + %files -f linux-firmware.files %defattr(-,root,root,-) @@ -401,13 +402,35 @@ cat %{fwdir}/REDHAT-DISCLAIMER > /dev/kmsg %doc WHENCE LICENCE.* LICENSE.* %changelog -* Sat Jan 13 2018 Rafael Aquini - 20170606-58.gitc990aae -- Revert amd-ucode for fam17h -- Add disclaimer message on current u-code updates +* Tue Feb 20 2018 Rafael Aquini - 20180220-62.git6d51311 +- nfp: NIC stops transmitting for small MSS values when TSO is enabled (rhbz 1542263) +- chelsio: pull in latests firmware 1.17.14.0 (rhbz 1538590) + +* Tue Jan 16 2018 Rafael Aquini - 20180113-61.git65b1c68 +- Adjust Requires(post) for functional scripting due to ucode revert (rhbz 1533945) -* Wed Dec 27 2017 Rafael Aquini - 20170606-57.gitc990aae +* Sat Jan 13 2018 Rafael Aquini - 20180113-60.git65b1c68 +- Update to latest upstream linux-firmware image for assorted updates +- netr: Add Netronome TC flower firmware (rhbz 1518900) +- Revert amd-ucode for fam17h (rhbz 1533945) + +* Wed Jan 03 2018 Rafael Aquini - 20171127-59.git17e6288 - Add amd-ucode for fam17h +* Mon Nov 27 2017 Rafael Aquini - 20171127-58.git17e6288 +- Update to latest upstream linux-firmware image for assorted updates +- iwlwifi: Firmware update for 3160, 3168, 7260, 7265 and 7265D WIFI devices (rhbz 1508709) +- iwlwifi: Firmware update for 8260 and 8265 WIFI devices (rhbz 1508711) +- iwlwifi: Firmware update for 9260 and 9560 WIFI devices (rhbz 1501166) +- Fixes CVE-2016-0801 CVE-2017-0561 CVE-2017-9417 + +* Wed Oct 11 2017 Rafael Aquini - 20171011-57.gitbf04291 +- Update to latest upstream linux-firmware image for assorted updates +- ath10k: Update to the latest firmware released version (rhbz 1457363) +- opa: update Intel Omni-Path Architecture firmware (rhbz 1452785) +- chelsio: Pull in the latest firmware 1.16.63.0 (rhbz 1458328) +- qla2xxx: Update firmware version to 8.07.00 (rhbz 1427148) + * Mon Jun 26 2017 Rafael Aquini - 20170606-56.gitc990aae - opa: Revert switch firmware back to 0.47 (rhbz 1464629)