diff --git a/.gitignore b/.gitignore index 2ab6e55..4fc617f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/linux-firmware-20140911.tar.gz +SOURCES/cxgb4-old-fw.tar.bz2 +SOURCES/linux-firmware-20150904.tar.gz diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index cdd8459..25ced65 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1 +1,2 @@ -1fb865d3ff8572374ea8056eecfe1879e072390e SOURCES/linux-firmware-20140911.tar.gz +951c12002e3a566ed13435766bb019ed280071ac SOURCES/cxgb4-old-fw.tar.bz2 +9b0ff7e220151edf12081895a6f49a626fbf9a42 SOURCES/linux-firmware-20150904.tar.gz diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index 4df2779..530a903 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,9 +1,9 @@ -%global checkout 365e80c -%global iwlwifi_release 36 +%global checkout 6ebf5d5 +%global firmware_release 43 Name: linux-firmware -Version: 20140911 -Release: 0.1.git%{checkout}%{?dist} +Version: 20150904 +Release: %{firmware_release}.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel Group: System Environment/Kernel @@ -25,6 +25,18 @@ Obsoletes: ql2500-firmware <= 5.08.00-2 Obsoletes: rt61pci-firmware <= 1.2-11 Obsoletes: rt73usb-firmware <= 1.8-11 Obsoletes: bfa-firmware <= 3.2.21.1-1 +# Mark the obsolecence of removed sub-packages (see bug 1232315) +Obsoletes: libertas-usb8388-firmware +Obsoletes: libertas-sd8686-firmware +Obsoletes: libertas-sd8787-firmware +Obsoletes: libertas-usb8388-olpc-firmware + +# We need to keep old fw blobs for backwards compat in RHEL. +# RPMDiff tool complained about old firmware going away as well, +# so here's where we're keeping them for now. Chelsio needs to +# remedy the situation with their upstream firmware tree updates +# removing old firmwares. +Source1: cxgb4-old-fw.tar.bz2 %define fwdir /usr/lib/firmware @@ -36,7 +48,7 @@ operate. Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters License: Redistributable, no modification permitted Version: 39.31.5.1 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl100-firmware < 39.31.5.1-4 %description -n iwl100-firmware This package contains the firmware required by the iwlagn driver @@ -48,7 +60,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 105 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} %description -n iwl105-firmware This package contains the firmware required by the iwlagn driver for Linux to support the iwl105 hardware. Usage of the firmware @@ -59,7 +71,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 135 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} %description -n iwl135-firmware This package contains the firmware required by the iwlagn driver for Linux to support the iwl135 hardware. Usage of the firmware @@ -71,7 +83,7 @@ Summary: Firmware for Intel® PRO/Wireless 1000 B/G/N network adaptors License: Redistributable, no modification permitted Version: 39.31.5.1 Epoch: 1 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl1000-firmware < 1:39.31.5.1-3 %description -n iwl1000-firmware This package contains the firmware required by the iwlagn driver @@ -83,7 +95,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 2000 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} %description -n iwl2000-firmware This package contains the firmware required by the iwlagn driver for Linux to support the iwl2000 hardware. Usage of the firmware @@ -94,7 +106,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 2030 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} %description -n iwl2030-firmware This package contains the firmware required by the iwlagn driver for Linux to support the iwl2030 hardware. Usage of the firmware @@ -105,7 +117,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Dual Band Wireless-AC 3160 Series Adapters License: Redistributable, no modification permitted Version: 22.0.7.0 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} %description -n iwl3160-firmware This package contains the firmware required by the iwlagn driver for Linux to support the iwl3160 hardware. Usage of the firmware @@ -116,7 +128,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 3945 A/B/G network adaptors License: Redistributable, no modification permitted Version: 15.32.2.9 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl3945-firmware < 15.32.2.9-7 %description -n iwl3945-firmware This package contains the firmware required by the iwl3945 driver @@ -127,7 +139,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 4965 A/G/N network adaptors License: Redistributable, no modification permitted Version: 228.61.2.24 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl4965-firmware < 228.61.2.24-5 %description -n iwl4965-firmware This package contains the firmware required by the iwl4965 driver @@ -138,7 +150,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors License: Redistributable, no modification permitted Version: 8.83.5.1_1 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl5000-firmware < 8.83.5.1_1-3 %description -n iwl5000-firmware This package contains the firmware required by the iwl5000 driver @@ -149,7 +161,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 5150 A/G/N network adaptors License: Redistributable, no modification permitted Version: 8.24.2.2 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl5150-firmware < 8.24.2.2-4 %description -n iwl5150-firmware This package contains the firmware required by the iwl5150 driver @@ -160,7 +172,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6000 AGN Adapter License: Redistributable, no modification permitted Version: 9.221.4.1 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl6000-firmware < 9.221.4.1-4 %description -n iwl6000-firmware This package contains the firmware required by the iwlagn driver @@ -171,7 +183,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6005 Series Adapters License: Redistributable, no modification permitted Version: 17.168.5.3 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl6000g2a-firmware < 17.168.5.3-3 %description -n iwl6000g2a-firmware This package contains the firmware required by the iwlagn driver @@ -182,7 +194,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6030 Series Adapters License: Redistributable, no modification permitted Version: 17.168.5.2 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl6000g2b-firmware < 17.168.5.2-3 %description -n iwl6000g2b-firmware This package contains the firmware required by the iwlagn driver @@ -193,7 +205,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6050 Series Adapters License: Redistributable, no modification permitted Version: 41.28.5.1 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} Obsoletes: iwl6050-firmware < 41.28.5.1-5 %description -n iwl6050-firmware This package contains the firmware required by the iwlagn driver @@ -204,7 +216,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Dual Band Wireless-AC 7260 Series Adapters License: Redistributable, no modification permitted Version: 22.0.7.0 -Release: %{iwlwifi_release}%{?dist} +Release: %{firmware_release}%{?dist} %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 @@ -214,15 +226,15 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Dual Band Wireless-AC 7265 Series Adapters License: Redistributable, no modification permitted Version: 22.0.7.0 -Release: %{iwlwifi_release}%{?dist} +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 -q -n linux-firmware-#{checkout} -%setup -q -c -n linux-firmware-%{checkout} +# Setup Source0 and additional Source1 +%setup -q -a 1 -c -n linux-firmware-%{checkout} %build # Remove firmware shipped in separate packages already @@ -235,7 +247,8 @@ rm v4l-cx23418-apu.fw v4l-cx23418-cpu.fw v4l-cx23418-dig.fw v4l-cx25840.fw rm -f usbdux/*dux */*.asm rm -rf carl9170fw -# Due to bugs 1007411 and 1079114, nuke the amd microcode for now +# AMD ucode still breaks overflow signal handler and sampling on at least +# some AMD systems, so remove it *again*. rm -rf LICENSE.amd-ucode amd-ucode # Remove firmware images for WiFi & WiMax drivers not compiled in RHEL7 kernel @@ -252,6 +265,13 @@ rm -f i6050-fw-usb-1.5.sbcf # Remove images for vxge, we do not provide that driver in RHEL7 kernel rm -rf vxge +# Fix up cxgb4 symlinks per bug 1262128 +pushd cxgb4 +rm -f t4fw.bin t5fw.bin +ln -s t4fw-1.13.32.0.bin t4fw.bin +ln -s t5fw-1.13.32.0.bin t5fw.bin +popd + %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{fwdir} @@ -307,9 +327,7 @@ rm -rf $RPM_BUILD_ROOT %files -n iwl3160-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -%{fwdir}/iwlwifi-3160-7.ucode -%{fwdir}/iwlwifi-3160-8.ucode -%{fwdir}/iwlwifi-3160-9.ucode +%{fwdir}/iwlwifi-3160-*.ucode %files -n iwl3945-firmware %defattr(-,root,root,-) @@ -354,15 +372,15 @@ rm -rf $RPM_BUILD_ROOT %files -n iwl7260-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -%{fwdir}/iwlwifi-7260-7.ucode -%{fwdir}/iwlwifi-7260-8.ucode -%{fwdir}/iwlwifi-7260-9.ucode +%{fwdir}/iwlwifi-7260-*.ucode %files -n iwl7265-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -%{fwdir}/iwlwifi-7265-8.ucode -%{fwdir}/iwlwifi-7265-9.ucode +%{fwdir}/iwlwifi-7265-*.ucode +%{fwdir}/iwlwifi-7265D-*.ucode +# Followin up Fedora where they have included iwlwifi-8000C blob +%{fwdir}/iwlwifi-8000C-*.ucode %files -f linux-firmware.files %defattr(-,root,root,-) @@ -371,6 +389,33 @@ rm -rf $RPM_BUILD_ROOT %doc WHENCE LICENCE.* LICENSE.* %changelog +* Mon Sep 14 2015 Jarod Wilson - 20150904-43.git6ebf5d5 +- Add more old chelsio firmwares, they nuked the one the driver in + RHEL7.2 is expecting from upstream (rhbz 1262128) +- Remove amd-ucode again, it simply breaks too many systems (rhbz 1246393) + +* Fri Sep 04 2015 Rafael Aquini - 20150904-42.git6ebf5d5 +- Add Intel Omni-Path Architecture hfi1 Firmware (rhbz 1194910) +- Update skl firmware for gpu (rhbz 1210012) + +* Wed Aug 12 2015 Rafael Aquini - 20150727-41.git75cc3ef +- Declare obsolecence for (old) removed firmware subpackages (rhbz 1232315) + +* Mon Jul 27 2015 Rafael Aquini - 20150727-40.git75cc3ef +- Add firmware support for the "Snowfield Peak" wireless adapter (rhbz 1169604) + +* Tue Jul 21 2015 Rafael Aquini - 20150612-39.git3161bfa +- Restore AMD-ucode firmware blob again (rhbz 1016168) + +* Thu Jun 18 2015 Rafael Aquini - 20150612-38.git3161bfa +- Reintroduce upstream nuked cxgb4 firmware old blobs (rhbz 1189256) + +* Fri Jun 12 2015 Rafael Aquini - 20150612-37.git3161bfa +- Update to latest upstream linux-firmware image for assorted updates +- cxgb4: Update firmware to revision 1.13.32.0 (rhbz 1189256) +- qat: Update to the latest upstream firmware (rhbz 1173792) +- Use a common version number for both the iwl*-firmware packages and linux-firmware itself + * Thu Sep 11 2014 Jarod Wilson - 20140911-0.1.git365e80c - Update to latest upstream linux-firmware image for assorted updates - Adds Intel Quick Assist Technology firmware (rhbz 1127338)