summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux-firmware
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2016-03-23 07:52:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-25 10:29:17 +0000
commitcea2a2112489175ef1bf4c54ccecb8793e01a05e (patch)
treebef6a766b520ad9b1fc25f8f592bba49451171a7 /meta/recipes-kernel/linux-firmware
parent3b3fe1da359f9ea6b4d5bb86a7c407451d41f1ac (diff)
downloadpoky-cea2a2112489175ef1bf4c54ccecb8793e01a05e.tar.gz
linux-firmware: Collapse iwlwifi firmware blobs for 7260 and 7265
There are newer blobs that are not include since we currently package blobs independtly, this will ensure that future updates are correctly added to the packages. (From OE-Core rev: 23372863b511ac07ba8ee33e3677073b1c7e2417) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux-firmware')
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb35
1 files changed, 17 insertions, 18 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index bfca5fcc12..09c2ae2d8d 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -186,9 +186,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
186 ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \ 186 ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \
187 ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \ 187 ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \
188 ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \ 188 ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \
189 ${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9 \ 189 ${PN}-iwlwifi-7260 \
190 ${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9 \ 190 ${PN}-iwlwifi-7265 \
191 \
192 ${PN}-license \ 191 ${PN}-license \
193 " 192 "
194 193
@@ -399,11 +398,8 @@ LICENSE_${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware"
399LICENSE_${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware" 398LICENSE_${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware"
400LICENSE_${PN}-iwlwifi-6050-4 = "Firmware-iwlwifi_firmware" 399LICENSE_${PN}-iwlwifi-6050-4 = "Firmware-iwlwifi_firmware"
401LICENSE_${PN}-iwlwifi-6050-5 = "Firmware-iwlwifi_firmware" 400LICENSE_${PN}-iwlwifi-6050-5 = "Firmware-iwlwifi_firmware"
402LICENSE_${PN}-iwlwifi-7260-7 = "Firmware-iwlwifi_firmware" 401LICENSE_${PN}-iwlwifi-7260 = "Firmware-iwlwifi_firmware"
403LICENSE_${PN}-iwlwifi-7260-8 = "Firmware-iwlwifi_firmware" 402LICENSE_${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware"
404LICENSE_${PN}-iwlwifi-7260-9 = "Firmware-iwlwifi_firmware"
405LICENSE_${PN}-iwlwifi-7265-8 = "Firmware-iwlwifi_firmware"
406LICENSE_${PN}-iwlwifi-7265-9 = "Firmware-iwlwifi_firmware"
407 403
408FILES_${PN}-iwlwifi-license = "/lib/firmware/LICENCE.iwlwifi_firmware" 404FILES_${PN}-iwlwifi-license = "/lib/firmware/LICENCE.iwlwifi_firmware"
409FILES_${PN}-iwlwifi-135-6 = "/lib/firmware/iwlwifi-135-6.ucode" 405FILES_${PN}-iwlwifi-135-6 = "/lib/firmware/iwlwifi-135-6.ucode"
@@ -417,11 +413,8 @@ FILES_${PN}-iwlwifi-6000g2b-5 = "/lib/firmware/iwlwifi-6000g2b-5.ucode"
417FILES_${PN}-iwlwifi-6000g2b-6 = "/lib/firmware/iwlwifi-6000g2b-6.ucode" 413FILES_${PN}-iwlwifi-6000g2b-6 = "/lib/firmware/iwlwifi-6000g2b-6.ucode"
418FILES_${PN}-iwlwifi-6050-4 = "/lib/firmware/iwlwifi-6050-4.ucode" 414FILES_${PN}-iwlwifi-6050-4 = "/lib/firmware/iwlwifi-6050-4.ucode"
419FILES_${PN}-iwlwifi-6050-5 = "/lib/firmware/iwlwifi-6050-5.ucode" 415FILES_${PN}-iwlwifi-6050-5 = "/lib/firmware/iwlwifi-6050-5.ucode"
420FILES_${PN}-iwlwifi-7260-7 = "/lib/firmware/iwlwifi-7260-7.ucode" 416FILES_${PN}-iwlwifi-7260 = "/lib/firmware/iwlwifi-7260-*.ucode"
421FILES_${PN}-iwlwifi-7260-8 = "/lib/firmware/iwlwifi-7260-8.ucode" 417FILES_${PN}-iwlwifi-7265 = "/lib/firmware/iwlwifi-7265-*.ucode"
422FILES_${PN}-iwlwifi-7260-9 = "/lib/firmware/iwlwifi-7260-9.ucode"
423FILES_${PN}-iwlwifi-7265-8 = "/lib/firmware/iwlwifi-7265-8.ucode"
424FILES_${PN}-iwlwifi-7265-9 = "/lib/firmware/iwlwifi-7265-9.ucode"
425 418
426RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" 419RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license"
427RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" 420RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license"
@@ -434,11 +427,17 @@ RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license"
434RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license" 427RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license"
435RDEPENDS_${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license" 428RDEPENDS_${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license"
436RDEPENDS_${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license" 429RDEPENDS_${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license"
437RDEPENDS_${PN}-iwlwifi-7260-7 = "${PN}-iwlwifi-license" 430RDEPENDS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-license"
438RDEPENDS_${PN}-iwlwifi-7260-8 = "${PN}-iwlwifi-license" 431RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license"
439RDEPENDS_${PN}-iwlwifi-7260-9 = "${PN}-iwlwifi-license" 432
440RDEPENDS_${PN}-iwlwifi-7265-8 = "${PN}-iwlwifi-license" 433# Handle package updating for the newly merged iwlwifi groupings
441RDEPENDS_${PN}-iwlwifi-7265-9 = "${PN}-iwlwifi-license" 434RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9"
435RREPLACES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9"
436RCONFLICTS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9"
437
438RPROVIDES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9"
439RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9"
440RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9"
442 441
443# For other firmwares 442# For other firmwares
444# Maybe split out to separate packages when needed. 443# Maybe split out to separate packages when needed.