diff --git a/.gitignore b/.gitignore index ff35f78..721e69f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/linux-firmware-20160830.tar.gz +SOURCES/hfi1-fw-git44d8e8d.tar.gz +SOURCES/linux-firmware-20170606.tar.gz diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index 91afb0c..156c35d 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1 +1,2 @@ -082c37c67ab7246443434e60cb359950e6be9fe2 SOURCES/linux-firmware-20160830.tar.gz +7c598272a756a563e716560f185bbf04aed06f5e SOURCES/hfi1-fw-git44d8e8d.tar.gz +1b5325e3d5a2e6903c837315a285f6ecfd93d1af SOURCES/linux-firmware-20170606.tar.gz diff --git a/SOURCES/0001-Revert-Update-Intel-OPA-hfi1-firmware.patch b/SOURCES/0001-Revert-Update-Intel-OPA-hfi1-firmware.patch new file mode 100644 index 0000000..fd021df --- /dev/null +++ b/SOURCES/0001-Revert-Update-Intel-OPA-hfi1-firmware.patch @@ -0,0 +1,18 @@ +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 2325dd1..0405101 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,8 +1,8 @@ -%global checkout 7534e19 -%global firmware_release 49 +%global checkout c990aae +%global firmware_release 56 Name: linux-firmware -Version: 20160830 +Version: 20170606 Release: %{firmware_release}.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel @@ -32,6 +32,11 @@ Obsoletes: libertas-sd8787-firmware Obsoletes: libertas-usb8388-olpc-firmware %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 %description Kernel-firmware includes firmware files required for some devices to @@ -226,8 +231,10 @@ 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} +# Setup Source0 and additional Source1 +%setup -q -a 1 -c -n linux-firmware-%{checkout} +# RHBZ 1464629 (reverts rhbz 1452253) +%patch0 -p1 -b .bz1464629 %build # Remove firmware shipped in separate packages already @@ -254,6 +261,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 + %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{fwdir} @@ -369,10 +379,39 @@ rm -rf $RPM_BUILD_ROOT %files -f linux-firmware.files %defattr(-,root,root,-) %dir %{fwdir} -%dir %{fwdir}/updates +#%dir %{fwdir}/updates %doc WHENCE LICENCE.* LICENSE.* %changelog +* Mon Jun 26 2017 Rafael Aquini - 20170606-56.gitc990aae +- opa: Revert switch firmware back to 0.47 (rhbz 1464629) + +* Tue Jun 06 2017 Rafael Aquini - 20170606-55.gitc990aae +- chelsio: Pull in the latest firmware 1.16.45.0 (rhbz 1457631) + +* Tue May 30 2017 Rafael Aquini - 20170530-54.gitdf40d15 +- Update to latest upstream linux-firmware image for assorted updates +- opa: HFI firmware problems with new OPA switch firmware (rhbz 1452253) + +* Tue May 23 2017 Rafael Aquini - 20170328-53.git44d8e8d +- chelsio: Pull in the latest firmware 1.16.43.0 (rhbz 1451387) + +* Tue Mar 28 2017 Rafael Aquini - 20170328-52.git44d8e8d +- Update to latest upstream linux-firmware image for assorted updates +- nfp: add firmware for Netronome Ethernet Driver (rhbz 1432592) + +* Tue Mar 07 2017 Rafael Aquini - 20170307-51.git87714d8 +- Update to latest upstream linux-firmware image for assorted updates +- chelsio: Update to the latest firmware released version (rhbz 1385911) +- drm: Update for radeon and amdgpu latest firmware released version (rhbz 1425197) + +* Fri Feb 17 2017 Rafael Aquini - 20170217-50.git6d3bc88 +- Update to latest upstream linux-firmware image for assorted updates +- chelsio: Update to the latest firmware released version (rhbz 1395322) +- iwlwifi: Update to the latest firmware released version (rhbz 1385749) +- ath10k: Update to the latest firmware released version (rhbz 1385743) +- hfi1: Update to the latest firmware released version (rhbz 1382805) + * Tue Aug 30 2016 Rafael Aquini - 20160830-49.git7534e19 - Update to latest upstream linux-firmware image for assorted updates - Update QCA6174/hw3.0/board-2.bin file to support ath10k devices (rhbz 1368159)