diff options
author | 2016-03-23 07:52:13 -0700 | |
---|---|---|
committer | 2016-03-24 21:44:27 +0000 | |
commit | 23372863b511ac07ba8ee33e3677073b1c7e2417 (patch) | |
tree | 1d074c9df45d60fbaa7304c2ff5fa43d65ca33e0 /meta/recipes-kernel/linux-firmware | |
parent | ef8983e8d144aa7b7365142ebb8c627cb8d0ecce (diff) | |
download | openembedded-core-contrib-23372863b511ac07ba8ee33e3677073b1c7e2417.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.
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.bb | 35 |
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 \ ${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-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9 \ - ${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9 \ - \ + ${PN}-iwlwifi-7260 \ + ${PN}-iwlwifi-7265 \ ${PN}-license \ " @@ -399,11 +398,8 @@ LICENSE_${PN}-iwlwifi-6000g2a-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-7 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7260-8 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7260-9 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7265-8 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7265-9 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-7260 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware" FILES_${PN}-iwlwifi-license = "/lib/firmware/LICENCE.iwlwifi_firmware" FILES_${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" FILES_${PN}-iwlwifi-6000g2b-6 = "/lib/firmware/iwlwifi-6000g2b-6.ucode" FILES_${PN}-iwlwifi-6050-4 = "/lib/firmware/iwlwifi-6050-4.ucode" FILES_${PN}-iwlwifi-6050-5 = "/lib/firmware/iwlwifi-6050-5.ucode" -FILES_${PN}-iwlwifi-7260-7 = "/lib/firmware/iwlwifi-7260-7.ucode" -FILES_${PN}-iwlwifi-7260-8 = "/lib/firmware/iwlwifi-7260-8.ucode" -FILES_${PN}-iwlwifi-7260-9 = "/lib/firmware/iwlwifi-7260-9.ucode" -FILES_${PN}-iwlwifi-7265-8 = "/lib/firmware/iwlwifi-7265-8.ucode" -FILES_${PN}-iwlwifi-7265-9 = "/lib/firmware/iwlwifi-7265-9.ucode" +FILES_${PN}-iwlwifi-7260 = "/lib/firmware/iwlwifi-7260-*.ucode" +FILES_${PN}-iwlwifi-7265 = "/lib/firmware/iwlwifi-7265-*.ucode" RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" @@ -434,11 +427,17 @@ RDEPENDS_${PN}-iwlwifi-6000g2a-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-7 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7260-8 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7260-9 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7265-8 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7265-9 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license" + +# 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" +RCONFLICTS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" + +RPROVIDES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" +RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" +RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" # For other firmwares # Maybe split out to separate packages when needed. |