diff --git a/.gitignore b/.gitignore index c66847f..2ab6e55 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/linux-firmware-20140804.tar.gz +SOURCES/linux-firmware-20140911.tar.gz diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index eda5266..cdd8459 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1 +1 @@ -b968f1c85979ed36d26de55debd8261c8da9efa8 SOURCES/linux-firmware-20140804.tar.gz +1fb865d3ff8572374ea8056eecfe1879e072390e SOURCES/linux-firmware-20140911.tar.gz diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index 760c757..4df2779 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,8 +1,8 @@ -%global checkout 6bce2b0 -%global iwlwifi_release 35 +%global checkout 365e80c +%global iwlwifi_release 36 Name: linux-firmware -Version: 20140804 +Version: 20140911 Release: 0.1.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel @@ -220,34 +220,6 @@ 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 libertas-usb8388-firmware -Summary: Firmware for Marvell Libertas USB 8388 Network Adapter -License: Redistributable, no modification permitted -Epoch: 2 -Obsoletes: libertas-usb8388-firmware < 2:5.110.22.p23-8 -%description -n libertas-usb8388-firmware -Firmware for Marvell Libertas USB 8388 Network Adapter - -%package -n libertas-usb8388-olpc-firmware -Summary: OLPC firmware for Marvell Libertas USB 8388 Network Adapter -License: Redistributable, no modification permitted -%description -n libertas-usb8388-olpc-firmware -Firmware for Marvell Libertas USB 8388 Network Adapter with OLPC mesh network -support. - -%package -n libertas-sd8686-firmware -Summary: Firmware for Marvell Libertas SD 8686 Network Adapter -License: Redistributable, no modification permitted -Obsoletes: libertas-sd8686-firmware < 9.70.20.p0-4 -%description -n libertas-sd8686-firmware -Firmware for Marvell Libertas SD 8686 Network Adapter - -%package -n libertas-sd8787-firmware -Summary: Firmware for Marvell Libertas SD 8787 Network Adapter -License: Redistributable, no modification permitted -%description -n libertas-sd8787-firmware -Firmware for Marvell Libertas SD 8787 Network Adapter - %prep #setup -q -n linux-firmware-#{checkout} %setup -q -c -n linux-firmware-%{checkout} @@ -263,14 +235,23 @@ rm v4l-cx23418-apu.fw v4l-cx23418-cpu.fw v4l-cx23418-dig.fw v4l-cx25840.fw rm -f usbdux/*dux */*.asm rm -rf carl9170fw -# No need to install old firmware versions where we also provide newer versions -# which are preferred and support the same (or more) hardware -rm -f libertas/sd8686_v8* -rm -f libertas/usb8388_v5.bin - # Due to bugs 1007411 and 1079114, nuke the amd microcode for now rm -rf LICENSE.amd-ucode amd-ucode +# Remove firmware images for WiFi & WiMax drivers not compiled in RHEL7 kernel +rm -rf ath6k +rm -rf ti-connectivity +rm -rf libertas +rm -f mrvl/sd8688.bin +rm -f mrvl/sd8688_helper.bin +rm -rf mwl8k +rm -f i2400m-fw-usb-1.4.sbcf +rm -f i2400m-fw-usb-1.5.sbcf +rm -f i6050-fw-usb-1.5.sbcf + +# Remove images for vxge, we do not provide that driver in RHEL7 kernel +rm -rf vxge + %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{fwdir} @@ -286,9 +267,6 @@ find . -type d | sed -e '/^.$/d' > $FILEDIR/linux-firmware.dirs popd sed -i -e 's:^./::' linux-firmware.{files,dirs} sed -i -e '/^iwlwifi/d' \ - -i -e '/^libertas\/sd8686/d' \ - -i -e '/^libertas\/usb8388/d' \ - -i -e '/^mrvl\/sd8787/d' \ linux-firmware.files sed -i -e 's/^/\/usr\/lib\/firmware\//' linux-firmware.{files,dirs} sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files @@ -386,30 +364,6 @@ rm -rf $RPM_BUILD_ROOT %{fwdir}/iwlwifi-7265-8.ucode %{fwdir}/iwlwifi-7265-9.ucode -%files -n libertas-usb8388-firmware -%defattr(-,root,root,-) -%doc WHENCE LICENCE.Marvell -%dir %{fwdir}/libertas -%{fwdir}/libertas/usb8388_v9.bin - -%files -n libertas-usb8388-olpc-firmware -%defattr(-,root,root,-) -%doc WHENCE LICENCE.Marvell -%dir %{fwdir}/libertas -%{fwdir}/libertas/usb8388_olpc.bin - -%files -n libertas-sd8686-firmware -%defattr(-,root,root,-) -%doc WHENCE LICENCE.Marvell -%dir %{fwdir}/libertas -%{fwdir}/libertas/sd8686* - -%files -n libertas-sd8787-firmware -%defattr(-,root,root,-) -%doc WHENCE LICENCE.Marvell -%dir %{fwdir}/mrvl -%{fwdir}/mrvl/sd8787* - %files -f linux-firmware.files %defattr(-,root,root,-) %dir %{fwdir} @@ -417,8 +371,15 @@ rm -rf $RPM_BUILD_ROOT %doc WHENCE LICENCE.* LICENSE.* %changelog +* 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) +- Updates bnx2x adapter firmware to version 7.10.51 (rhbz 1089403) +- Updates myri10ge adapter firmware to version 1.4.57 (rhbz 1063702) +- Removes firmware for drivers not shipped with Red Hat Enterprise Linux 7 (rhbz 1016595) + * Mon Aug 04 2014 Jarod Wilson - 20140804-0.1.git6bce2b0 -- Update to latest linux-firmware to pick up new Qlogic firmware (rhbz 1126474) +- Update to latest linux-firmware to pick up new Qlogic firmware (rhbz 1089364) * Mon Mar 24 2014 Prarit Bhargava - 20140213-0.3.git4164c23 - Revert AMD firmware update again (rhbz 1079114)