summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorChristopher Clark <christopher.clark6@baesystems.com>2016-06-20 10:48:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-23 14:26:16 +0100
commitc4067634eb338165bc4230293c15687030bb26dd (patch)
treec34845dbf35df15693b37a3b76164025f1125d43 /meta/recipes-kernel
parent5f854c231bc8cced63826681de4b96672614c430 (diff)
downloadpoky-c4067634eb338165bc4230293c15687030bb26dd.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. (From OE-Core rev: 610f821261a99411725b6c850fd16a397e58ada6) Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb10
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 \
229 ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ 229 ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \
230 ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k \ 230 ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k \
231 \ 231 \
232 ${PN}-iwlwifi-license ${PN}-iwlwifi-135-6 \ 232 ${PN}-iwlwifi-license ${PN}-iwlwifi \
233 ${PN}-iwlwifi-135-6 \
233 ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8 ${PN}-iwlwifi-3160-9 \ 234 ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8 ${PN}-iwlwifi-3160-9 \
234 ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \ 235 ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \
235 ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \ 236 ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \
@@ -453,6 +454,7 @@ FILES_${PN}-whence-license = "/lib/firmware/WHENCE"
453RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license" 454RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license"
454 455
455# For iwlwifi 456# For iwlwifi
457LICENSE_${PN}-iwlwifi = "Firmware-iwlwifi_firmware"
456LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware" 458LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware"
457LICENSE_${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware" 459LICENSE_${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware"
458LICENSE_${PN}-iwlwifi-3160-8 = "Firmware-iwlwifi_firmware" 460LICENSE_${PN}-iwlwifi-3160-8 = "Firmware-iwlwifi_firmware"
@@ -507,6 +509,8 @@ RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license"
507RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license" 509RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license"
508RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license" 510RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license"
509 511
512ALLOW_EMPTY_${PN}-iwlwifi = "1"
513
510# Handle package updating for the newly merged iwlwifi groupings 514# Handle package updating for the newly merged iwlwifi groupings
511RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" 515RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9"
512RREPLACES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" 516RREPLACES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9"
@@ -580,7 +584,11 @@ RDEPENDS_${PN} += "${PN}-license"
580RDEPENDS_${PN} += "${PN}-whence-license" 584RDEPENDS_${PN} += "${PN}-whence-license"
581 585
582# Make linux-firmware depend on all of the split-out packages. 586# Make linux-firmware depend on all of the split-out packages.
587# Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages.
583python populate_packages_prepend () { 588python populate_packages_prepend () {
584 firmware_pkgs = oe.utils.packages_filter_out_system(d) 589 firmware_pkgs = oe.utils.packages_filter_out_system(d)
585 d.appendVar('RDEPENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs)) 590 d.appendVar('RDEPENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs))
591
592 iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs)
593 d.appendVar('RDEPENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs))
586} 594}