diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index b945955..a5ade2b 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1 +1 @@ -eb3eebff893035c990797b3340fe1cef23c7520e SOURCES/linux-firmware-20131106.tar.gz +eacaa7d5be6f41d41eaf65445a7e97278d867c16 SOURCES/linux-firmware-20140213.tar.gz diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index 56fad45..9a2f685 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,9 +1,9 @@ -%global checkout 7d0c7a8 -%global iwlwifi_release 27 +%global checkout 4164c23 +%global iwlwifi_release 34 Name: linux-firmware -Version: 20131106 -Release: 0.1.git%{checkout}%{?dist} +Version: 20140213 +Release: 0.3.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel Group: System Environment/Kernel @@ -26,6 +26,8 @@ Obsoletes: rt61pci-firmware <= 1.2-11 Obsoletes: rt73usb-firmware <= 1.8-11 Obsoletes: bfa-firmware <= 3.2.21.1-1 +%define fwdir /usr/lib/firmware + %description Kernel-firmware includes firmware files required for some devices to operate. @@ -35,7 +37,7 @@ 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} -Obsoletes: iwl100-firmware < iwl100-firmware-39.31.5.1-4 +Obsoletes: iwl100-firmware < 39.31.5.1-4 %description -n iwl100-firmware This package contains the firmware required by the iwlagn driver for Linux to support the iwl100 hardware. Usage of the firmware @@ -256,19 +258,19 @@ rm -rf carl9170fw rm -f libertas/sd8686_v8* rm -f libertas/usb8388_v5.bin -# Due to bug 1007411, nuke the amd microcode for now +# Due to bugs 1007411 and 1079114, nuke the amd microcode for now rm -rf LICENSE.amd-ucode amd-ucode %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/lib/firmware -mkdir -p $RPM_BUILD_ROOT/lib/firmware/updates -cp -r * $RPM_BUILD_ROOT/lib/firmware -rm $RPM_BUILD_ROOT/lib/firmware/{WHENCE,LICENCE.*,LICENSE.*} +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.*} # Create file list but exclude firmwares that we place in subpackages FILEDIR=`pwd` -pushd $RPM_BUILD_ROOT/lib/firmware +pushd $RPM_BUILD_ROOT%{fwdir} find . \! -type d > $FILEDIR/linux-firmware.files find . -type d | sed -e '/^.$/d' > $FILEDIR/linux-firmware.dirs popd @@ -278,7 +280,7 @@ sed -i -e '/^iwlwifi/d' \ -i -e '/^libertas\/usb8388/d' \ -i -e '/^mrvl\/sd8787/d' \ linux-firmware.files -sed -i -e 's/^/\/lib\/firmware\//' linux-firmware.{files,dirs} +sed -i -e 's/^/\/usr\/lib\/firmware\//' linux-firmware.{files,dirs} sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %clean @@ -287,114 +289,140 @@ rm -rf $RPM_BUILD_ROOT %files -n iwl100-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-100-5.ucode +%{fwdir}/iwlwifi-100-5.ucode %files -n iwl105-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-105-*.ucode +%{fwdir}/iwlwifi-105-*.ucode %files -n iwl135-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-135-*.ucode +%{fwdir}/iwlwifi-135-*.ucode %files -n iwl1000-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-1000-*.ucode +%{fwdir}/iwlwifi-1000-*.ucode %files -n iwl2000-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-2000-*.ucode +%{fwdir}/iwlwifi-2000-*.ucode %files -n iwl2030-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-2030-*.ucode +%{fwdir}/iwlwifi-2030-*.ucode %files -n iwl3160-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-3160-7.ucode +%{fwdir}/iwlwifi-3160-7.ucode +%{fwdir}/iwlwifi-3160-8.ucode %files -n iwl3945-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-3945-*.ucode +%{fwdir}/iwlwifi-3945-*.ucode %files -n iwl4965-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-4965-*.ucode +%{fwdir}/iwlwifi-4965-*.ucode %files -n iwl5000-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-5000-*.ucode +%{fwdir}/iwlwifi-5000-*.ucode %files -n iwl5150-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-5150-*.ucode +%{fwdir}/iwlwifi-5150-*.ucode %files -n iwl6000-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-6000-*.ucode +%{fwdir}/iwlwifi-6000-*.ucode %files -n iwl6000g2a-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-6000g2a-*.ucode +%{fwdir}/iwlwifi-6000g2a-*.ucode %files -n iwl6000g2b-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-6000g2b-*.ucode +%{fwdir}/iwlwifi-6000g2b-*.ucode %files -n iwl6050-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-6050-*.ucode +%{fwdir}/iwlwifi-6050-*.ucode %files -n iwl7260-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.iwlwifi_firmware -/lib/firmware/iwlwifi-7260-7.ucode +%{fwdir}/iwlwifi-7260-7.ucode +%{fwdir}/iwlwifi-7260-8.ucode %files -n libertas-usb8388-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.Marvell -%dir /lib/firmware/libertas -/lib/firmware/libertas/usb8388_v9.bin +%dir %{fwdir}/libertas +%{fwdir}/libertas/usb8388_v9.bin %files -n libertas-usb8388-olpc-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.Marvell -%dir /lib/firmware/libertas -/lib/firmware/libertas/usb8388_olpc.bin +%dir %{fwdir}/libertas +%{fwdir}/libertas/usb8388_olpc.bin %files -n libertas-sd8686-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.Marvell -%dir /lib/firmware/libertas -/lib/firmware/libertas/sd8686* +%dir %{fwdir}/libertas +%{fwdir}/libertas/sd8686* %files -n libertas-sd8787-firmware %defattr(-,root,root,-) %doc WHENCE LICENCE.Marvell -%dir /lib/firmware/mrvl -/lib/firmware/mrvl/sd8787* +%dir %{fwdir}/mrvl +%{fwdir}/mrvl/sd8787* %files -f linux-firmware.files %defattr(-,root,root,-) -%dir /lib/firmware -%dir /lib/firmware/updates +%dir %{fwdir} +%dir %{fwdir}/updates %doc WHENCE LICENCE.* LICENSE.* %changelog +* Mon Mar 24 2014 Prarit Bhargava - 20140213-0.3.git4164c23 +- Revert AMD firmware update again (rhbz 1079114) + +* Tue Mar 11 2014 Jarod Wilson - 20140213-0.2.git4164c23 +- Restore amd-ucode (rhbz 866700) + +* Thu Feb 13 2014 Jarod Wilson - 20140213-0.1.git4164c23 +- Add bnx2x FW 7.8.19 to fix FCoE on 4-port cards (rhbz 1061351) + +* Tue Jan 07 2014 Jarod Wilson - 20140102-0.2.git52d77db +- Fix Obsoletes for iwl100-firmware (rhbz 1035459) + +* Thu Jan 02 2014 Jarod Wilson - 20140102-0.1.git52d77db +- Update to latest linux-firmware to pick up new Brocade firmware (rhbz 1030677) + +* Fri Dec 27 2013 Daniel Mach - 20131106-0.4.git7d0c7a8 +- Mass rebuild 2013-12-27 + +* Tue Dec 03 2013 Jarod Wilson - 20131106-0.3.git7d0c7a8 +- Add new fwdir define for /usr/lib/firmware and use it (rhbz 884107) + +* Thu Nov 14 2013 Jarod Wilson - 20131106-0.2.git7d0c7a8 +- Temporarily add old brocade firmwares to work with not-yet-updated bfa driver (rhbz 1030532) + * Wed Nov 06 2013 Jarod Wilson - 20131106-0.1.git7d0c7a8 - Update to latest upstream linux-firmware to pick up bfa firmware (rhbz 1013426) - Fix up Obsoletes to all use <= comparisons @@ -421,7 +449,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Feb 21 2013 Josh Boyer - 20130201-0.4.git65a5163 - Obsolete netxen-firmware. Again. (rhbz 913680) -* Fri Feb 04 2013 Josh Boyer - 20130201-0.3.git65a5163 +* Mon Feb 04 2013 Josh Boyer - 20130201-0.3.git65a5163 - Obsolete ql2[45]00-firmware packages (rhbz 906898) * Fri Feb 01 2013 Josh Boyer