summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Clark <christopher.w.clark@gmail.com>2016-04-14 20:28:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:58:43 +0100
commit2c9ead480dd0421d8862428e018a6952747ecee4 (patch)
tree4f90efbbd91843831456410ec59d981b13aea6e8
parentf095fdc408c8075c7635218fbc252897cd6065f2 (diff)
downloadpoky-2c9ead480dd0421d8862428e018a6952747ecee4.tar.gz
linux-firmware: break out bnx2 mips firmware and WHENCE license
commit a19cfee10c1f1762da601125c17035cf7701ce91 Author: Christopher Clark <christopher.clark6@baesystems.com> Date: Thu Apr 14 17:00:20 2016 -0700 linux-firmware: break out bnx2 mips firmware and WHENCE license Break out the bnx2 mips firmware into an independent subpackage. Since the bnx2 firmware license is contained in the common WHENCE file also package that separately so that other firmware that is licensed within that file may depend upon a standalone package containing it. Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> (From OE-Core rev: a73a316429b256061a7aa48bcf29c5f96df68a8c) 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.bb20
1 files changed, 20 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 a4e64d549c..95a57d7347 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -55,6 +55,7 @@ LICENSE = "\
55 & Firmware-xc4000 \ 55 & Firmware-xc4000 \
56 & Firmware-xc5000 \ 56 & Firmware-xc5000 \
57 & Firmware-xc5000c \ 57 & Firmware-xc5000c \
58 & WHENCE \
58" 59"
59 60
60LIC_FILES_CHKSUM = "\ 61LIC_FILES_CHKSUM = "\
@@ -111,6 +112,7 @@ LIC_FILES_CHKSUM = "\
111 file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ 112 file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \
112 file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ 113 file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
113 file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ 114 file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \
115 file://WHENCE;md5=2ec7cdcaf7b1f57b77665b4d77b76e50 \
114" 116"
115 117
116# These are not common licenses, set NO_GENERIC_LICENSE for them 118# These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -168,6 +170,7 @@ NO_GENERIC_LICENSE[Firmware-wl1251] = "LICENCE.wl1251"
168NO_GENERIC_LICENSE[Firmware-xc4000] = "LICENCE.xc4000" 170NO_GENERIC_LICENSE[Firmware-xc4000] = "LICENCE.xc4000"
169NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" 171NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000"
170NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" 172NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c"
173NO_GENERIC_LICENSE[WHENCE] = "WHENCE"
171 174
172SRCREV = "5f8ca0c1db6106a2d6d7e85eee778917ff03c3de" 175SRCREV = "5f8ca0c1db6106a2d6d7e85eee778917ff03c3de"
173PE = "1" 176PE = "1"
@@ -227,6 +230,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
227 ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \ 230 ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \
228 ${PN}-i915-license ${PN}-i915 \ 231 ${PN}-i915-license ${PN}-i915 \
229 ${PN}-adsp-sst-license ${PN}-adsp-sst \ 232 ${PN}-adsp-sst-license ${PN}-adsp-sst \
233 ${PN}-bnx2-mips \
234 ${PN}-whence-license \
230 ${PN}-license \ 235 ${PN}-license \
231 " 236 "
232 237
@@ -425,6 +430,19 @@ RDEPENDS_${PN}-bcm43340 += "${PN}-broadcom-license"
425RDEPENDS_${PN}-bcm4339 += "${PN}-broadcom-license" 430RDEPENDS_${PN}-bcm4339 += "${PN}-broadcom-license"
426RDEPENDS_${PN}-bcm4354 += "${PN}-broadcom-license" 431RDEPENDS_${PN}-bcm4354 += "${PN}-broadcom-license"
427 432
433# For Broadcom bnx2-mips
434#
435# which is a separate case to the other Broadcom firmwares since its
436# license is contained in the shared WHENCE file.
437
438LICENSE_${PN}-bnx2-mips = "WHENCE"
439LICENSE_${PN}-whence-license = "WHENCE"
440
441FILES_${PN}-bnx2-mips = "/lib/firmware/bnx2/bnx2-mips-09-6.2.1b.fw"
442FILES_${PN}-whence-license = "/lib/firmware/WHENCE"
443
444RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license"
445
428# For iwlwifi 446# For iwlwifi
429LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware" 447LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware"
430LICENSE_${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware" 448LICENSE_${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware"
@@ -543,11 +561,13 @@ LICENSE_${PN} = "\
543 & Firmware-xc4000 \ 561 & Firmware-xc4000 \
544 & Firmware-xc5000 \ 562 & Firmware-xc5000 \
545 & Firmware-xc5000c \ 563 & Firmware-xc5000c \
564 & WHENCE \
546" 565"
547 566
548FILES_${PN}-license += "/lib/firmware/LICEN*" 567FILES_${PN}-license += "/lib/firmware/LICEN*"
549FILES_${PN} += "/lib/firmware/*" 568FILES_${PN} += "/lib/firmware/*"
550RDEPENDS_${PN} += "${PN}-license" 569RDEPENDS_${PN} += "${PN}-license"
570RDEPENDS_${PN} += "${PN}-whence-license"
551 571
552# Make linux-firmware depend on all of the split-out packages. 572# Make linux-firmware depend on all of the split-out packages.
553python populate_packages_prepend () { 573python populate_packages_prepend () {