diff options
| author |   Christopher Clark <christopher.clark6@baesystems.com> | 2016-06-20 10:48:54 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-23 14:23:35 +0100 |
| commit | 610f821261a99411725b6c850fd16a397e58ada6 (patch) | |
| tree | 069e91719653b674ec33fc2078cde36080d08ae1 | |
| parent | ed46f5a37e136317ad02d985ea235208f7bc2855 (diff) | |
| download | openembedded-core-contrib-610f821261a99411725b6c850fd16a397e58ada6.tar.gz | |
linux-firmware: add iwlwifi virtual package of all iwlwifi firmwares
Depends upon all available iwlwifi firmware packages at build time.
Fix typo in ALLOW_EMPTY of earlier version.
Motivation: simplifies inclusion of all Intel wifi firmwares.
Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index e9a9c495f3..c5fabf285c 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -229,7 +229,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k \ \ - ${PN}-iwlwifi-license ${PN}-iwlwifi-135-6 \ + ${PN}-iwlwifi-license ${PN}-iwlwifi \ + ${PN}-iwlwifi-135-6 \ ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8 ${PN}-iwlwifi-3160-9 \ ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \ ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \ @@ -453,6 +454,7 @@ FILES_${PN}-whence-license = "/lib/firmware/WHENCE" RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-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" @@ -507,6 +509,8 @@ RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license" +ALLOW_EMPTY_${PN}-iwlwifi = "1" + # Handle package updating for the newly merged iwlwifi groupings RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" RREPLACES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" @@ -580,7 +584,11 @@ RDEPENDS_${PN} += "${PN}-license" RDEPENDS_${PN} += "${PN}-whence-license" # Make linux-firmware depend on all of the split-out packages. +# Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. python populate_packages_prepend () { firmware_pkgs = oe.utils.packages_filter_out_system(d) d.appendVar('RDEPENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs)) + + iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) + d.appendVar('RDEPENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) } |