rpms/linux-firmware
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Join iwl3945-firmware and iwl4965-firmware into iwlegacy-firmware

Browse Source 
There is no reason to keep those two small firmware packages separated,
since nowadays a single kernel module uses them (iwlegacy). This can
be seen also on the old subpackage descriptions mentioning the old
modules that don't exist anymore.

v2: Add provides to the obsoleted packages as suggested by Josh Boyer

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
This commit is contained in:
Herton R. Krzesinski 2023-05-26 17:08:52 -03:00
parent 25bc692e62
commit 25536d49d9
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
linux-firmware.spec
View File

@ -5,7 +5,7 @@
Name: linux-firmware Name: linux-firmware
Version: 20230515 Version: 20230515
Release: 150%{?dist} Release: 151%{?dist}
Summary: Firmware files used by the Linux kernel Summary: Firmware files used by the Linux kernel
License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
URL: http://www.kernel.org/ URL: http://www.kernel.org/
@ -89,6 +89,19 @@ Requires: linux-firmware-whence
%description -n brcmfmac-firmware %description -n brcmfmac-firmware
Firmware for Broadcom/Cypress brcmfmac WiFi/Bluetooth adapters. Firmware for Broadcom/Cypress brcmfmac WiFi/Bluetooth adapters.
%package -n iwlegacy-firmware
Summary: Firmware for Intel(R) Wireless WiFi Link 3945(A)BG and 4965AGN adapters
License: Redistributable, no modification permitted
Requires: linux-firmware-whence
Obsoletes: iwl3945-firmware < %{version}-%{release}
Obsoletes: iwl4965-firmware < %{version}-%{release}
Provides: iwl3945-firmware = %{version}-%{release}
Provides: iwl4965-firmware = %{version}-%{release}
%description -n iwlegacy-firmware
This package contains the firmware required by the iwlegacy 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 iwl100-firmware %package -n iwl100-firmware
Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
@ -160,24 +173,6 @@ This package contains the firmware required by the Intel wireless drivers
for Linux. Usage of the firmware is subject to the terms and conditions for Linux. Usage of the firmware is subject to the terms and conditions
contained inside the provided LICENSE file. Please read it carefully. contained inside the provided LICENSE file. Please read it carefully.
%package -n iwl3945-firmware
Summary: Firmware for Intel® PRO/Wireless 3945 A/B/G network adaptors
License: Redistributable, no modification permitted
Requires: linux-firmware-whence
%description -n iwl3945-firmware
This package contains the firmware required by the iwl3945 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 iwl4965-firmware
Summary: Firmware for Intel® PRO/Wireless 4965 A/G/N network adaptors
License: Redistributable, no modification permitted
Requires: linux-firmware-whence
%description -n iwl4965-firmware
This package contains the firmware required by the iwl4965 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 iwl5000-firmware %package -n iwl5000-firmware
Summary: Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors Summary: Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
@ -485,6 +480,11 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%{_firmwarepath}/brcm/ %{_firmwarepath}/brcm/
%{_firmwarepath}/cypress/ %{_firmwarepath}/cypress/
%files -n iwlegacy-firmware
%license LICENCE.iwlwifi_firmware
%{_firmwarepath}/iwlwifi-3945-*.ucode*
%{_firmwarepath}/iwlwifi-4965-*.ucode*
%files -n iwl100-firmware %files -n iwl100-firmware
%license LICENCE.iwlwifi_firmware %license LICENCE.iwlwifi_firmware
%{_firmwarepath}/iwlwifi-100-5.ucode* %{_firmwarepath}/iwlwifi-100-5.ucode*
@ -514,14 +514,6 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%{_firmwarepath}/iwlwifi-3160-*.ucode* %{_firmwarepath}/iwlwifi-3160-*.ucode*
%{_firmwarepath}/iwlwifi-3168-*.ucode* %{_firmwarepath}/iwlwifi-3168-*.ucode*
%files -n iwl3945-firmware
%license LICENCE.iwlwifi_firmware
%{_firmwarepath}/iwlwifi-3945-*.ucode*
%files -n iwl4965-firmware
%license LICENCE.iwlwifi_firmware
%{_firmwarepath}/iwlwifi-4965-*.ucode*
%files -n iwl5000-firmware %files -n iwl5000-firmware
%license LICENCE.iwlwifi_firmware %license LICENCE.iwlwifi_firmware
%{_firmwarepath}/iwlwifi-5000-*.ucode* %{_firmwarepath}/iwlwifi-5000-*.ucode*
@ -638,6 +630,9 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%{_firmwarepath}/v4l-cx2* %{_firmwarepath}/v4l-cx2*
%changelog %changelog
* Fri May 26 2023 Herton R. Krzesinski <herton@redhat.com> - 20230515-151
- Join iwl3945-firmware and iwl4965-firmware into iwlegacy-firmware package.
* Tue May 16 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 20230515-150 * Tue May 16 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 20230515-150
- Update to upstream 20230515 release - Update to upstream 20230515 release
- Drop ancient iwlwifi versioning and use upstream date format version - Drop ancient iwlwifi versioning and use upstream date format version