Create iwlwifi-mvm-firmware subpackage and fold some subpackages into it
The remaining splitted iwl*-firmware packages does not follow a logical
pattern. We have firmware for iwl 7xxx/8xxx/9xxx devices provided by
iwl7260-firmware, which for some devices mean a somewhat misleading
package name. Then, a single set of firmware for 3160/3168 devices
are provided in the iwl3160-firmware package. And the remaining firmware
is provided through iwlax2xx-firmware.
Looking at the iwlwifi source in linux, we have this at iwlwifi/Makefile:
iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o
Where the driver seems to group devices which uses the called MVM
firmware under a single umbrella. Some of these devices are:
cfg/7000
iwlwifi-3160-*.ucode - Intel(R) Dual Band Wireless AC 3160
Intel(R) Dual Band Wireless N 3160
Intel(R) Wireless N 3160
iwlwifi-3168-*.ucode - Intel(R) Dual Band Wireless AC 3168
iwlwifi-7260-*.ucode - Intel(R) Dual Band Wireless AC/N 7260
Intel(R) Wireless N 7260
iwlwifi-7265-*.ucode - Intel(R) Dual Band Wireless AC/N 7265
Intel(R) Wireless N 7265
iwlwifi-7265D-*.ucode - Intel(R) Dual Band Wireless AC 3165
Intel(R) Dual Band Wireless AC/N 7265
Intel(R) Wireless N 7265
cfg/8000
iwlwifi-8000C-*.ucode - Intel(R) Dual Band Wireless N/AC 8260
Intel(R) Dual Band Wireless AC 4165
iwlwifi-8265-*.ucode - Intel(R) Dual Band Wireless AC 8265
Intel(R) Dual Band Wireless AC 8275
cfg/9000
iwlwifi-9000-*.ucode - Killer(R) Wireless-AC 1550s/1550i Wireless Network Adapter (9560NGW)
Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz
Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) 160MHz
Intel(R) Wireless-AC 9461/9462/9560 160MHz
Intel(R) Wireless-AC 9461/9462/9560
iwlwifi-9260-*.ucode - Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz
Intel(R) Wireless-AC 9162/9260/9260-1/9270/9461/9462
Intel(R) Wireless-AC 9162/9260/9270/9461/9462 160MHz
For cfg/22000 the list looks long and I will not describe everything
here, but should be the remaining list which was covered by
iwlax2xx-firmware.
Thus, we can follow the same logic here and group all firmware under
the new iwlwifi-mvm-firmware:
* we fix the iwl7260-firmware case where it's not only about 7260
devices, and avoid having to use Recommends between it and
iwlax2xx-firmware which in practice means it's already
advised keeping both installed together.
* don't need to keep a small/alone iwl3160-firmware.
* avoid having a device name in the package which can turn misleading
as well, eg. we already have devices with name ax4xx like
"Intel(R) Wi-Fi 6E AX411 160MHz"
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
parent
19118dd341
commit
ead01369f5
@ -136,36 +136,21 @@ for Linux built with DVM firmware support (CONFIG_IWLDVM=y/m). Usage of
|
||||
the firmware is subject to the terms and conditions contained inside the
|
||||
provided LICENSE file. Please read it carefully.
|
||||
|
||||
%package -n iwl3160-firmware
|
||||
Summary: Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters
|
||||
License: Redistributable, no modification permitted
|
||||
Epoch: 1
|
||||
Requires: linux-firmware-whence
|
||||
%description -n iwl3160-firmware
|
||||
This package contains the firmware required by the Intel wireless drivers
|
||||
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 iwl7260-firmware
|
||||
Summary: Firmware for Intel(R) Wireless WiFi Link 726x/8000/9000 Series Adapters
|
||||
License: Redistributable, no modification permitted
|
||||
Epoch: 1
|
||||
Requires: linux-firmware-whence
|
||||
Recommends: iwlax2xx-firmware
|
||||
%description -n iwl7260-firmware
|
||||
This package contains the firmware required by the Intel wireless drivers
|
||||
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 iwlax2xx-firmware
|
||||
Summary: Firmware for Intel(R) Wireless WiFi Link AX2xx Series Adapters
|
||||
%package -n iwlwifi-mvm-firmware
|
||||
Summary: MVM Firmware for Intel(R) Wireless WiFi adapters
|
||||
License: Redistributable, no modification permitted
|
||||
Requires: linux-firmware-whence
|
||||
Recommends: iwl7260-firmware
|
||||
%description -n iwlax2xx-firmware
|
||||
This package contains the firmware required by the Intel wireless drivers
|
||||
for Linux. Usage of the firmware is subject to the terms and conditions
|
||||
contained inside the provided LICENSE file. Please read it carefully.
|
||||
Obsoletes: iwl3160-firmware < 1:%{version}-%{release}
|
||||
Obsoletes: iwl7260-firmware < 1:%{version}-%{release}
|
||||
Obsoletes: iwlax2xx-firmware < %{version}-%{release}
|
||||
Provides: iwl3160-firmware = 1:%{version}-%{release}
|
||||
Provides: iwl7260-firmware = 1:%{version}-%{release}
|
||||
Provides: iwlax2xx-firmware = %{version}-%{release}
|
||||
%description -n iwlwifi-mvm-firmware
|
||||
This package contains the firmware required by the iwlwifi driver
|
||||
for Linux built with MVM firmware support (CONFIG_IWLMVM=y/m). Usage of
|
||||
the firmware is subject to the terms and conditions contained inside the
|
||||
provided LICENSE file. Please read it carefully.
|
||||
|
||||
%package -n libertas-sd8686-firmware
|
||||
Summary: Firmware for Marvell Libertas SD 8686 Network Adapter
|
||||
@ -419,13 +404,10 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
|
||||
%{_firmwarepath}/iwlwifi-6000g2b-*.ucode*
|
||||
%{_firmwarepath}/iwlwifi-6050-*.ucode*
|
||||
|
||||
%files -n iwl3160-firmware
|
||||
%files -n iwlwifi-mvm-firmware
|
||||
%license LICENCE.iwlwifi_firmware
|
||||
%{_firmwarepath}/iwlwifi-3160-*.ucode*
|
||||
%{_firmwarepath}/iwlwifi-3168-*.ucode*
|
||||
|
||||
%files -n iwl7260-firmware
|
||||
%license LICENCE.iwlwifi_firmware
|
||||
%{_firmwarepath}/iwlwifi-7260-*.ucode*
|
||||
%{_firmwarepath}/iwlwifi-7265-*.ucode*
|
||||
%{_firmwarepath}/iwlwifi-7265D-*.ucode*
|
||||
@ -433,9 +415,6 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
|
||||
%{_firmwarepath}/iwlwifi-8265-*.ucode*
|
||||
%{_firmwarepath}/iwlwifi-9000-*.ucode*
|
||||
%{_firmwarepath}/iwlwifi-9260-*.ucode*
|
||||
|
||||
%files -n iwlax2xx-firmware
|
||||
%license LICENCE.iwlwifi_firmware
|
||||
%{_firmwarepath}/iwlwifi-cc-a0-*.ucode*
|
||||
%{_firmwarepath}/iwlwifi-Qu*.ucode*
|
||||
%{_firmwarepath}/iwlwifi-ty-a0*
|
||||
@ -519,6 +498,7 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
|
||||
* Fri May 26 2023 Herton R. Krzesinski <herton@redhat.com> - 20230515-151
|
||||
- Join iwl3945-firmware and iwl4965-firmware into iwlegacy-firmware package.
|
||||
- Create iwlwifi-dvm-firmware subpackage and fold some subpackages into it.
|
||||
- Create iwlwifi-mvm-firmware subpackage and fold some subpackages into it.
|
||||
|
||||
* Tue May 16 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 20230515-150
|
||||
- Update to upstream 20230515 release
|
||||
|
||||
Loading…
Reference in New Issue
Block a user