diff mbox series

Clearing empty linux firmware packages

Message ID 20260129160033.849551-1-yann.cardaillac@balena.io (mailing list archive)
State New
Headers show
Series Clearing empty linux firmware packages | expand

Commit Message

Yann Cardaillac Jan. 29, 2026, 4 p.m. UTC
Removing packages:
- ${PN}-wl1251 as it's already shipped in linux-firmware-wl12xx
- Removing old ${PN}-iwlwifi-3160-* as only the version ${PN}-iwlwifi-3160-17 is now shipped
- Removing ${PN}-iwlwifi-6000g2b-5 and ${PN}-iwlwifi-6000g2a-5 as they are replaced by versions 6
- Removing ${PN}-iwlwifi-6050-4 as it's replaced by ${PN}-iwlwifi-6050-5

Signed-off-by: Yann CARDAILLAC <yann.cardaillac@balena.io>
---
 .../linux-firmware/linux-firmware_20240909.bb | 56 ++-----------------
 1 file changed, 4 insertions(+), 52 deletions(-)

Comments

Yoann Congal Jan. 29, 2026, 4:14 p.m. UTC | #1
Le jeu. 29 janv. 2026 à 17:00, Yann Cardaillac via lists.yoctoproject.org
<yann.cardaillac=balena.io@lists.yoctoproject.org> a écrit :

> Removing packages:
> - ${PN}-wl1251 as it's already shipped in linux-firmware-wl12xx
> - Removing old ${PN}-iwlwifi-3160-* as only the version
> ${PN}-iwlwifi-3160-17 is now shipped
> - Removing ${PN}-iwlwifi-6000g2b-5 and ${PN}-iwlwifi-6000g2a-5 as they are
> replaced by versions 6
> - Removing ${PN}-iwlwifi-6050-4 as it's replaced by ${PN}-iwlwifi-6050-5
>
> Signed-off-by: Yann CARDAILLAC <yann.cardaillac@balena.io>
>

Hello Yann, ;)

It looks like you are trying to send this to one of the OE-core stable
branches.
In this case, the correct ML address is
openembedded-core@lists.openembedded.org
(See the README:
https://git.openembedded.org/openembedded-core/tree/README.OE-Core.md?h=scarthgap#n25
)
Also, you need to have the [scarthgap], [kirkstone], ... tag in your patch
title depending on your target.
And finally, keep in mind that this can only be accepted if the problem is
solved in the more recent branches (stables and master) so you might need
to send this to multiple branches.

Everything should be documented here:
https://docs.yoctoproject.org/contributor-guide/submit-changes.html#finding-a-suitable-mailing-list
https://docs.yoctoproject.org/contributor-guide/submit-changes.html#submitting-changes-to-stable-release-branches

Thanks!


> ---
>  .../linux-firmware/linux-firmware_20240909.bb | 56 ++-----------------
>  1 file changed, 4 insertions(+), 52 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
> b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
> index 30c47d7720..2a0f8049ce 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
> @@ -71,7 +71,6 @@ LICENSE = "\
>      & Firmware-ti-keystone \
>      & Firmware-ueagle-atm4-firmware \
>      & Firmware-via_vt6656 \
> -    & Firmware-wl1251 \
>      & Firmware-xc4000 \
>      & Firmware-xc5000 \
>      & Firmware-xc5000c \
> @@ -224,7 +223,6 @@ NO_GENERIC_LICENSE[Firmware-ti-connectivity] =
> "LICENCE.ti-connectivity"
>  NO_GENERIC_LICENSE[Firmware-ti-keystone] = "LICENCE.ti-keystone"
>  NO_GENERIC_LICENSE[Firmware-ueagle-atm4-firmware] =
> "LICENCE.ueagle-atm4-firmware"
>  NO_GENERIC_LICENSE[Firmware-via_vt6656] = "LICENCE.via_vt6656"
> -NO_GENERIC_LICENSE[Firmware-wl1251] = "LICENCE.wl1251"
>  NO_GENERIC_LICENSE[Firmware-xc4000] = "LICENCE.xc4000"
>  NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000"
>  NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c"
> @@ -327,13 +325,11 @@ PACKAGES =+ "${PN}-amphion-vpu-license
> ${PN}-amphion-vpu \
>               ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q
> ${PN}-imx-sdma-imx7d \
>               \
>               ${PN}-iwlwifi-license ${PN}-iwlwifi \
> +             ${PN}-iwlwifi-3160-17 \
>               ${PN}-iwlwifi-135-6 \
> -             ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8
> ${PN}-iwlwifi-3160-9 \
> -             ${PN}-iwlwifi-3160-10 ${PN}-iwlwifi-3160-12
> ${PN}-iwlwifi-3160-13 \
> -             ${PN}-iwlwifi-3160-16 ${PN}-iwlwifi-3160-17 \
> -             ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5
> ${PN}-iwlwifi-6000g2a-6 \
> -             ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \
> -             ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \
> +             ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-6 \
> +             ${PN}-iwlwifi-6000g2b-6 \
> +             ${PN}-iwlwifi-6050-5 \
>               ${PN}-iwlwifi-7260 \
>               ${PN}-iwlwifi-7265 \
>               ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \
> @@ -398,7 +394,6 @@ PACKAGES =+ "${PN}-amphion-vpu-license
> ${PN}-amphion-vpu \
>               ${PN}-amlogic-vdec-license ${PN}-amlogic-vdec \
>               ${PN}-lt9611uxc ${PN}-lontium-license \
>               ${PN}-whence-license \
> -             ${PN}-wl1251-license ${PN}-wl1251 \
>               ${PN}-xc4000-license ${PN}-xc4000 \
>               ${PN}-xc5000-license ${PN}-xc5000 \
>               ${PN}-xc5000c-license ${PN}-xc5000c \
> @@ -877,18 +872,6 @@ RDEPENDS:${PN}-rtl8822 += "${PN}-rtl-license"
>  RDEPENDS:${PN}-rtl8168 += "${PN}-whence-license"
>  RDEPENDS:${PN}-rtl-nic += "${PN}-whence-license"
>
> -# For TI wl1251
> -LICENSE:${PN}-wl1251 = "Firmware-wl1251"
> -LICENSE:${PN}-wl1251-license = "Firmware-wl1251"
> -
> -FILES:${PN}-wl1251 = " \
> -  ${nonarch_base_libdir}/firmware/ti-connectivity/wl1251-fw.bin         \
> -  ${nonarch_base_libdir}/firmware/ti-connectivity/wl1251-nvs.bin        \
> -"
> -FILES:${PN}-wl1251-license =
> "${nonarch_base_libdir}/firmware/LICENCE.wl1251"
> -
> -RDEPENDS:${PN}-wl1251 += "${PN}-wl1251-license"
> -
>  # For ti-connectivity
>  LICENSE:${PN}-wlcommon = "Firmware-ti-connectivity"
>  LICENSE:${PN}-wl12xx = "Firmware-ti-connectivity"
> @@ -1174,20 +1157,10 @@ RDEPENDS:${PN}-imx-sdma-imx7d +=
> "${PN}-imx-sdma-license"
>  # For iwlwifi
>  LICENSE:${PN}-iwlwifi           = "Firmware-iwlwifi_firmware"
>  LICENSE:${PN}-iwlwifi-135-6     = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-3160-7    = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-3160-8    = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-3160-9    = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-3160-10   = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-3160-12   = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-3160-13   = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-3160-16   = "Firmware-iwlwifi_firmware"
>  LICENSE:${PN}-iwlwifi-3160-17   = "Firmware-iwlwifi_firmware"
>  LICENSE:${PN}-iwlwifi-6000-4    = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware"
>  LICENSE:${PN}-iwlwifi-6000g2a-6 = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-6000g2b-5 = "Firmware-iwlwifi_firmware"
>  LICENSE:${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware"
> -LICENSE:${PN}-iwlwifi-6050-4    = "Firmware-iwlwifi_firmware"
>  LICENSE:${PN}-iwlwifi-6050-5    = "Firmware-iwlwifi_firmware"
>  LICENSE:${PN}-iwlwifi-7260      = "Firmware-iwlwifi_firmware"
>  LICENSE:${PN}-iwlwifi-7265      = "Firmware-iwlwifi_firmware"
> @@ -1202,20 +1175,10 @@ LICENSE:${PN}-iwlwifi-license   =
> "Firmware-iwlwifi_firmware"
>
>  FILES:${PN}-iwlwifi-license =
> "${nonarch_base_libdir}/firmware/LICENCE.iwlwifi_firmware"
>  FILES:${PN}-iwlwifi-135-6 =
> "${nonarch_base_libdir}/firmware/iwlwifi-135-6.ucode"
> -FILES:${PN}-iwlwifi-3160-7 =
> "${nonarch_base_libdir}/firmware/iwlwifi-3160-7.ucode"
> -FILES:${PN}-iwlwifi-3160-8 =
> "${nonarch_base_libdir}/firmware/iwlwifi-3160-8.ucode"
> -FILES:${PN}-iwlwifi-3160-9 =
> "${nonarch_base_libdir}/firmware/iwlwifi-3160-9.ucode"
> -FILES:${PN}-iwlwifi-3160-10 =
> "${nonarch_base_libdir}/firmware/iwlwifi-3160-10.ucode"
> -FILES:${PN}-iwlwifi-3160-12 =
> "${nonarch_base_libdir}/firmware/iwlwifi-3160-12.ucode"
> -FILES:${PN}-iwlwifi-3160-13 =
> "${nonarch_base_libdir}/firmware/iwlwifi-3160-13.ucode"
> -FILES:${PN}-iwlwifi-3160-16 =
> "${nonarch_base_libdir}/firmware/iwlwifi-3160-16.ucode"
>  FILES:${PN}-iwlwifi-3160-17 =
> "${nonarch_base_libdir}/firmware/iwlwifi-3160-17.ucode"
>  FILES:${PN}-iwlwifi-6000-4 =
> "${nonarch_base_libdir}/firmware/iwlwifi-6000-4.ucode"
> -FILES:${PN}-iwlwifi-6000g2a-5 =
> "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-5.ucode"
>  FILES:${PN}-iwlwifi-6000g2a-6 =
> "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-6.ucode"
> -FILES:${PN}-iwlwifi-6000g2b-5 =
> "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-5.ucode"
>  FILES:${PN}-iwlwifi-6000g2b-6 =
> "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-6.ucode"
> -FILES:${PN}-iwlwifi-6050-4 =
> "${nonarch_base_libdir}/firmware/iwlwifi-6050-4.ucode"
>  FILES:${PN}-iwlwifi-6050-5 =
> "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.ucode"
>  FILES:${PN}-iwlwifi-7260   =
> "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode"
>  FILES:${PN}-iwlwifi-7265   =
> "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode"
> @@ -1230,20 +1193,10 @@ FILES:${PN}-iwlwifi-misc   = " \
>  "
>
>  RDEPENDS:${PN}-iwlwifi-135-6     = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-3160-7    = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-3160-8    = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-3160-9    = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-3160-10   = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-3160-12   = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-3160-13   = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-3160-16   = "${PN}-iwlwifi-license"
>  RDEPENDS:${PN}-iwlwifi-3160-17   = "${PN}-iwlwifi-license"
>  RDEPENDS:${PN}-iwlwifi-6000-4    = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license"
>  RDEPENDS:${PN}-iwlwifi-6000g2a-6 = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-6000g2b-5 = "${PN}-iwlwifi-license"
>  RDEPENDS:${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license"
> -RDEPENDS:${PN}-iwlwifi-6050-4    = "${PN}-iwlwifi-license"
>  RDEPENDS:${PN}-iwlwifi-6050-5    = "${PN}-iwlwifi-license"
>  RDEPENDS:${PN}-iwlwifi-7260      = "${PN}-iwlwifi-license"
>  RDEPENDS:${PN}-iwlwifi-7265      = "${PN}-iwlwifi-license"
> @@ -1552,7 +1505,6 @@ LICENSE:${PN} = "\
>      & Firmware-ti-connectivity \
>      & Firmware-ti-keystone \
>      & Firmware-ueagle-atm4-firmware \
> -    & Firmware-wl1251 \
>      & Firmware-xc4000 \
>      & Firmware-xc5000 \
>      & Firmware-xc5000c \
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#13829):
> https://lists.yoctoproject.org/g/poky/message/13829
> Mute This Topic: https://lists.yoctoproject.org/mt/117528186/4316185
> Group Owner: poky+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/poky/unsub [
> yoann.congal@smile.fr]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Quentin Schulz Jan. 29, 2026, 4:27 p.m. UTC | #2
Hi Yann,

On 1/29/26 5:00 PM, Yann Cardaillac via lists.yoctoproject.org wrote:
> [You don't often get email from yann.cardaillac=balena.io@lists.yoctoproject.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> 
> Removing packages:
> - ${PN}-wl1251 as it's already shipped in linux-firmware-wl12xx

NACK. We should backport bfe67c7775fb4a9177c7ca037ac08e93155b5808 and 
757d53f086a4458bc336b1db92c0ad9a5ae6ed70 from OE-Core instead. wl12xx 
has a different license than wl1251 so we really should have the files 
from wl1251 in their own package with the appropriate license.

> - Removing old ${PN}-iwlwifi-3160-* as only the version ${PN}-iwlwifi-3160-17 is now shipped

Does it hurt to keep the ${PN}-iwlwifi-3160-* packages? The issue is if 
a user of a stable release RDEPENDS or IMAGE_INSTALL's it explicitly, 
removing it means they won't be able to build their image anymore.

> - Removing ${PN}-iwlwifi-6000g2b-5 and ${PN}-iwlwifi-6000g2a-5 as they are replaced by versions 6

Ditto.

> - Removing ${PN}-iwlwifi-6050-4 as it's replaced by ${PN}-iwlwifi-6050-5
> 

Ditto.

> Signed-off-by: Yann CARDAILLAC <yann.cardaillac@balena.io>
> ---
>   .../linux-firmware/linux-firmware_20240909.bb | 56 ++-----------------
>   1 file changed, 4 insertions(+), 52 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
> index 30c47d7720..2a0f8049ce 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb

And finally, this recipe is only (as far as I could tell) in Styhead 
which is not maintained anymore. If something needs to be fixed in 
kirkstone, scarthgap, whinlatter or master, then we can discuss about 
doing something about it (except master, all must be non-breaking changes).

Cheers,
Quentin
Yann Cardaillac Feb. 3, 2026, 10:01 a.m. UTC | #3
Hello guys,

Thanks for the feedback!

Next version of the patch will be in the proper mailing list, this was on
Scarthgap.

Quentin, I've had an issue when trying to install empty packages in my
image, essentially doing so would fail the build. But that could be thanks
to local distro settings, idk and I'm happy with this.

From my point of view, we shouldn't be shipping and maintaining
empty packages as they will inevitably accumulate over time.

Now do you rather have only the fix for 12xx and 1251 or also the package
removal? I can do 2 commits as well so that you can cherry pick the one
you're interested in.

Bests regards,

Yann
Yann Cardaillac Feb. 3, 2026, 10:04 a.m. UTC | #4
I just saw that you mentioned 2 commits fixing the 12xx and 1251 issue.

So do you guys want the package removal commit then? Keep me posted if so.

Thanks,

Yann
diff mbox series

Patch

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
index 30c47d7720..2a0f8049ce 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
@@ -71,7 +71,6 @@  LICENSE = "\
     & Firmware-ti-keystone \
     & Firmware-ueagle-atm4-firmware \
     & Firmware-via_vt6656 \
-    & Firmware-wl1251 \
     & Firmware-xc4000 \
     & Firmware-xc5000 \
     & Firmware-xc5000c \
@@ -224,7 +223,6 @@  NO_GENERIC_LICENSE[Firmware-ti-connectivity] = "LICENCE.ti-connectivity"
 NO_GENERIC_LICENSE[Firmware-ti-keystone] = "LICENCE.ti-keystone"
 NO_GENERIC_LICENSE[Firmware-ueagle-atm4-firmware] = "LICENCE.ueagle-atm4-firmware"
 NO_GENERIC_LICENSE[Firmware-via_vt6656] = "LICENCE.via_vt6656"
-NO_GENERIC_LICENSE[Firmware-wl1251] = "LICENCE.wl1251"
 NO_GENERIC_LICENSE[Firmware-xc4000] = "LICENCE.xc4000"
 NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000"
 NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c"
@@ -327,13 +325,11 @@  PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \
              \
              ${PN}-iwlwifi-license ${PN}-iwlwifi \
+             ${PN}-iwlwifi-3160-17 \
              ${PN}-iwlwifi-135-6 \
-             ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8 ${PN}-iwlwifi-3160-9 \
-             ${PN}-iwlwifi-3160-10 ${PN}-iwlwifi-3160-12 ${PN}-iwlwifi-3160-13 \
-             ${PN}-iwlwifi-3160-16 ${PN}-iwlwifi-3160-17 \
-             ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \
-             ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \
-             ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \
+             ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-6 \
+             ${PN}-iwlwifi-6000g2b-6 \
+             ${PN}-iwlwifi-6050-5 \
              ${PN}-iwlwifi-7260 \
              ${PN}-iwlwifi-7265 \
              ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \
@@ -398,7 +394,6 @@  PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-amlogic-vdec-license ${PN}-amlogic-vdec \
              ${PN}-lt9611uxc ${PN}-lontium-license \
              ${PN}-whence-license \
-             ${PN}-wl1251-license ${PN}-wl1251 \
              ${PN}-xc4000-license ${PN}-xc4000 \
              ${PN}-xc5000-license ${PN}-xc5000 \
              ${PN}-xc5000c-license ${PN}-xc5000c \
@@ -877,18 +872,6 @@  RDEPENDS:${PN}-rtl8822 += "${PN}-rtl-license"
 RDEPENDS:${PN}-rtl8168 += "${PN}-whence-license"
 RDEPENDS:${PN}-rtl-nic += "${PN}-whence-license"
 
-# For TI wl1251
-LICENSE:${PN}-wl1251 = "Firmware-wl1251"
-LICENSE:${PN}-wl1251-license = "Firmware-wl1251"
-
-FILES:${PN}-wl1251 = " \
-  ${nonarch_base_libdir}/firmware/ti-connectivity/wl1251-fw.bin         \
-  ${nonarch_base_libdir}/firmware/ti-connectivity/wl1251-nvs.bin        \
-"
-FILES:${PN}-wl1251-license = "${nonarch_base_libdir}/firmware/LICENCE.wl1251"
-
-RDEPENDS:${PN}-wl1251 += "${PN}-wl1251-license"
-
 # For ti-connectivity
 LICENSE:${PN}-wlcommon = "Firmware-ti-connectivity"
 LICENSE:${PN}-wl12xx = "Firmware-ti-connectivity"
@@ -1174,20 +1157,10 @@  RDEPENDS:${PN}-imx-sdma-imx7d += "${PN}-imx-sdma-license"
 # For iwlwifi
 LICENSE:${PN}-iwlwifi           = "Firmware-iwlwifi_firmware"
 LICENSE:${PN}-iwlwifi-135-6     = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-3160-7    = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-3160-8    = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-3160-9    = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-3160-10   = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-3160-12   = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-3160-13   = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-3160-16   = "Firmware-iwlwifi_firmware"
 LICENSE:${PN}-iwlwifi-3160-17   = "Firmware-iwlwifi_firmware"
 LICENSE:${PN}-iwlwifi-6000-4    = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware"
 LICENSE:${PN}-iwlwifi-6000g2a-6 = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-6000g2b-5 = "Firmware-iwlwifi_firmware"
 LICENSE:${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware"
-LICENSE:${PN}-iwlwifi-6050-4    = "Firmware-iwlwifi_firmware"
 LICENSE:${PN}-iwlwifi-6050-5    = "Firmware-iwlwifi_firmware"
 LICENSE:${PN}-iwlwifi-7260      = "Firmware-iwlwifi_firmware"
 LICENSE:${PN}-iwlwifi-7265      = "Firmware-iwlwifi_firmware"
@@ -1202,20 +1175,10 @@  LICENSE:${PN}-iwlwifi-license   = "Firmware-iwlwifi_firmware"
 
 FILES:${PN}-iwlwifi-license = "${nonarch_base_libdir}/firmware/LICENCE.iwlwifi_firmware"
 FILES:${PN}-iwlwifi-135-6 = "${nonarch_base_libdir}/firmware/iwlwifi-135-6.ucode"
-FILES:${PN}-iwlwifi-3160-7 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-7.ucode"
-FILES:${PN}-iwlwifi-3160-8 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-8.ucode"
-FILES:${PN}-iwlwifi-3160-9 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-9.ucode"
-FILES:${PN}-iwlwifi-3160-10 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-10.ucode"
-FILES:${PN}-iwlwifi-3160-12 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-12.ucode"
-FILES:${PN}-iwlwifi-3160-13 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-13.ucode"
-FILES:${PN}-iwlwifi-3160-16 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-16.ucode"
 FILES:${PN}-iwlwifi-3160-17 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-17.ucode"
 FILES:${PN}-iwlwifi-6000-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6000-4.ucode"
-FILES:${PN}-iwlwifi-6000g2a-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-5.ucode"
 FILES:${PN}-iwlwifi-6000g2a-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-6.ucode"
-FILES:${PN}-iwlwifi-6000g2b-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-5.ucode"
 FILES:${PN}-iwlwifi-6000g2b-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-6.ucode"
-FILES:${PN}-iwlwifi-6050-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-4.ucode"
 FILES:${PN}-iwlwifi-6050-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.ucode"
 FILES:${PN}-iwlwifi-7260   = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode"
 FILES:${PN}-iwlwifi-7265   = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode"
@@ -1230,20 +1193,10 @@  FILES:${PN}-iwlwifi-misc   = " \
 "
 
 RDEPENDS:${PN}-iwlwifi-135-6     = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-3160-7    = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-3160-8    = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-3160-9    = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-3160-10   = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-3160-12   = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-3160-13   = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-3160-16   = "${PN}-iwlwifi-license"
 RDEPENDS:${PN}-iwlwifi-3160-17   = "${PN}-iwlwifi-license"
 RDEPENDS:${PN}-iwlwifi-6000-4    = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license"
 RDEPENDS:${PN}-iwlwifi-6000g2a-6 = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-6000g2b-5 = "${PN}-iwlwifi-license"
 RDEPENDS:${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license"
-RDEPENDS:${PN}-iwlwifi-6050-4    = "${PN}-iwlwifi-license"
 RDEPENDS:${PN}-iwlwifi-6050-5    = "${PN}-iwlwifi-license"
 RDEPENDS:${PN}-iwlwifi-7260      = "${PN}-iwlwifi-license"
 RDEPENDS:${PN}-iwlwifi-7265      = "${PN}-iwlwifi-license"
@@ -1552,7 +1505,6 @@  LICENSE:${PN} = "\
     & Firmware-ti-connectivity \
     & Firmware-ti-keystone \
     & Firmware-ueagle-atm4-firmware \
-    & Firmware-wl1251 \
     & Firmware-xc4000 \
     & Firmware-xc5000 \
     & Firmware-xc5000c \