As it stands, the logic was set up such that the weak dependencies
were not being used in ELN, which makes optional minimization of
the package set for virtual machine images difficult for RHEL-ish
images.
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>
Right now some firmware for wireless devices that use the iwlwifi module
are splitted into several small *-firmware packages. Trying to make it
more maintainable fold the DVM Firmware into a single package called
iwlwifi-dvm-firmware. As can be seen in the linux Makefile from
iwlwifi:
iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o
The devices declared on the cfg/* files above are:
cfg/1000
iwlwifi-1000-*.ucode - Intel(R) Centrino(R) Wireless-N 1000 BG(N)
iwlwifi-100-*.ucode - Intel(R) Centrino(R) Wireless-N 100 BG(N)
cfg/2000
iwlwifi-105-*.ucode - Intel(R) Centrino(R) Wireless-N 105(D) BGN
iwlwifi-135-*.ucode - Intel(R) Centrino(R) Wireless-N 135 BGN
iwlwifi-2000-*.ucode - Intel(R) Centrino(R) Wireless-N 2200(D) BGN
iwlwifi-2030-*.ucode - Intel(R) Centrino(R) Wireless-N 2230 BGN
cfg/5000
iwlwifi-5000-*.ucode - Intel(R) WiMAX/WiFi Link 5350 AGN
Intel(R) Ultimate N WiFi Link 5300 AGN
Intel(R) WiFi Link 5100 BGN/ABG/AGN
iwlwifi-5150-*.ucode - Intel(R) WiMAX/WiFi Link 5150 AGN/ABG
cfg/6000
iwlwifi-6000-*.ucode - Intel(R) Centrino(R) Ultimate-N 6300 AGN
Intel(R) Centrino(R) Advanced-N 6200 AGN/ABG/BG
iwlwifi-6000g2a-*.ucode - Intel(R) Centrino(R) Advanced-N 6205 AGN/ABG/BG
Intel(R) Centrino(R) Advanced-N 6205S/6205D/6206/6207 AGN
iwlwifi-6000g2b-*.ucode - Intel(R) Centrino(R) Advanced-N 6230 AGN/ABG/BGN/BG
Intel(R) Centrino(R) Wireless-N 1030/130 BGN/BG
Intel(R) Centrino(R) Advanced-N 6235 AGN
Intel(R) Centrino(R) Ultimate-N 6235 AGN
iwlwifi-6050-*.ucode - Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN/ABG
Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BG(N)
So this change obsoletes/removes the following packages: iwl100-firmware,
iwl105-firmware, iwl135-firmware, iwl1000-firmware, iwl2000-firmware,
iwl2030-firmware, iwl5000-firmware, iwl5150-firmware, iwl6000-firmware,
iwl6000g2a-firmware, iwl6000g2b-firmware, iwl6050-firmware.
All firmware for those removed packages are now provided by
iwlwifi-dvm-firmware.
v2: Add provides to the obsoleted packages as suggested by Josh Boyer
Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
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>
These were meant to be split into a subpackage, but we neglected
to include a sed command to drop them from the main package file
list, so they wound up in *both* the main package and the sub
package. This should drop them from the main package.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
