summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Clark <christopher.clark6@baesystems.com>2016-06-20 10:48:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-23 14:26:16 +0100
commit0c8b264e03e14e98bd9ec3235bdaf8bf9f456e54 (patch)
treeae3c39dde472542c4d766080e8aa82dcb63a223f
parentc4067634eb338165bc4230293c15687030bb26dd (diff)
downloadpoky-0c8b264e03e14e98bd9ec3235bdaf8bf9f456e54.tar.gz
linux-firmware: add iwlwifi-misc package for remaining iwlwifi firmware
Package all remaining iwlwifi firmwares that are not individually packaged into a single package. This is distinct from the virtual linux-firmware-iwlwifi package so that the -misc firmwares can be installed without pulling in all other firmwares via dependencies. (From OE-Core rev: 9eeb4a479e1c85219e56272c66d7fc8aabc33574) 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>
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb10
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index c5fabf285c..e908289ac3 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -238,6 +238,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
238 ${PN}-iwlwifi-7260 \ 238 ${PN}-iwlwifi-7260 \
239 ${PN}-iwlwifi-7265 \ 239 ${PN}-iwlwifi-7265 \
240 ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \ 240 ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \
241 ${PN}-iwlwifi-misc \
241 ${PN}-i915-license ${PN}-i915 \ 242 ${PN}-i915-license ${PN}-i915 \
242 ${PN}-adsp-sst-license ${PN}-adsp-sst \ 243 ${PN}-adsp-sst-license ${PN}-adsp-sst \
243 ${PN}-bnx2-mips \ 244 ${PN}-bnx2-mips \
@@ -471,6 +472,7 @@ LICENSE_${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware"
471LICENSE_${PN}-iwlwifi-7265d = "Firmware-iwlwifi_firmware" 472LICENSE_${PN}-iwlwifi-7265d = "Firmware-iwlwifi_firmware"
472LICENSE_${PN}-iwlwifi-8000c = "Firmware-iwlwifi_firmware" 473LICENSE_${PN}-iwlwifi-8000c = "Firmware-iwlwifi_firmware"
473LICENSE_${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware" 474LICENSE_${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware"
475LICENSE_${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware"
474LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware" 476LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware"
475 477
476 478
@@ -491,6 +493,7 @@ FILES_${PN}-iwlwifi-7265 = "/lib/firmware/iwlwifi-7265-*.ucode"
491FILES_${PN}-iwlwifi-7265d = "/lib/firmware/iwlwifi-7265D-*.ucode" 493FILES_${PN}-iwlwifi-7265d = "/lib/firmware/iwlwifi-7265D-*.ucode"
492FILES_${PN}-iwlwifi-8000c = "/lib/firmware/iwlwifi-8000C-*.ucode" 494FILES_${PN}-iwlwifi-8000c = "/lib/firmware/iwlwifi-8000C-*.ucode"
493FILES_${PN}-iwlwifi-8265 = "/lib/firmware/iwlwifi-8265-*.ucode" 495FILES_${PN}-iwlwifi-8265 = "/lib/firmware/iwlwifi-8265-*.ucode"
496FILES_${PN}-iwlwifi-misc = "/lib/firmware/iwlwifi-*.ucode"
494 497
495RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" 498RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license"
496RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" 499RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license"
@@ -508,8 +511,15 @@ RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license"
508RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license" 511RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license"
509RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license" 512RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license"
510RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license" 513RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license"
514RDEPENDS_${PN}-iwlwifi-misc = "${PN}-iwlwifi-license"
511 515
516# -iwlwifi-misc is a "catch all" package that includes all the iwlwifi
517# firmwares that are not already included in other -iwlwifi- packages.
518# -iwlwifi is a virtual package that depends upon all iwlwifi packages.
519# These are distinct in order to allow the -misc firmwares to be installed
520# without pulling in every other iwlwifi package.
512ALLOW_EMPTY_${PN}-iwlwifi = "1" 521ALLOW_EMPTY_${PN}-iwlwifi = "1"
522ALLOW_EMPTY_${PN}-iwlwifi-misc = "1"
513 523
514# Handle package updating for the newly merged iwlwifi groupings 524# Handle package updating for the newly merged iwlwifi groupings
515RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" 525RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9"