diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-07-20 11:15:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-26 13:16:40 +0100 |
commit | d25a6780c6578405a1bfbd97e72f976ee3b02955 (patch) | |
tree | 54a598d2a9e240a464f35b8f0715ac0655bd1800 /meta/recipes-kernel | |
parent | 077ad469349734fe82f4cc920ed8375f5282d9dc (diff) | |
download | poky-d25a6780c6578405a1bfbd97e72f976ee3b02955.tar.gz |
linux-firmware: add ${PN}-cypress-license handling from meta-raspberrypi
* this will break meta-raspberrypi once more, by including
${PN}-cypress-license package twice in PACKAGES
I've sent fix here:
https://github.com/agherzan/meta-raspberrypi/pull/295
(From OE-Core rev: 37e06a68e30a0ff619344d6e8fd8462e9fdb32e2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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.bb | 12 |
1 files changed, 12 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 dff34e3e3a..898c87dcd1 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | |||
@@ -14,6 +14,7 @@ LICENSE = "\ | |||
14 | & Firmware-cavium \ | 14 | & Firmware-cavium \ |
15 | & Firmware-chelsio_firmware \ | 15 | & Firmware-chelsio_firmware \ |
16 | & Firmware-cw1200 \ | 16 | & Firmware-cw1200 \ |
17 | & Firmware-cypress \ | ||
17 | & Firmware-dib0700 \ | 18 | & Firmware-dib0700 \ |
18 | & Firmware-e100 \ | 19 | & Firmware-e100 \ |
19 | & Firmware-ene_firmware \ | 20 | & Firmware-ene_firmware \ |
@@ -74,6 +75,7 @@ LIC_FILES_CHKSUM = "\ | |||
74 | file://LICENCE.cavium;md5=c37aaffb1ebe5939b2580d073a95daea \ | 75 | file://LICENCE.cavium;md5=c37aaffb1ebe5939b2580d073a95daea \ |
75 | file://LICENCE.chelsio_firmware;md5=819aa8c3fa453f1b258ed8d168a9d903 \ | 76 | file://LICENCE.chelsio_firmware;md5=819aa8c3fa453f1b258ed8d168a9d903 \ |
76 | file://LICENCE.cw1200;md5=f0f770864e7a8444a5c5aa9d12a3a7ed \ | 77 | file://LICENCE.cw1200;md5=f0f770864e7a8444a5c5aa9d12a3a7ed \ |
78 | file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \ | ||
77 | file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ | 79 | file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ |
78 | file://LICENCE.e100;md5=ec0f84136766df159a3ae6d02acdf5a8 \ | 80 | file://LICENCE.e100;md5=ec0f84136766df159a3ae6d02acdf5a8 \ |
79 | file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ | 81 | file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ |
@@ -135,6 +137,7 @@ NO_GENERIC_LICENSE[Firmware-ca0132] = "LICENCE.ca0132" | |||
135 | NO_GENERIC_LICENSE[Firmware-cavium] = "LICENCE.cavium" | 137 | NO_GENERIC_LICENSE[Firmware-cavium] = "LICENCE.cavium" |
136 | NO_GENERIC_LICENSE[Firmware-chelsio_firmware] = "LICENCE.chelsio_firmware" | 138 | NO_GENERIC_LICENSE[Firmware-chelsio_firmware] = "LICENCE.chelsio_firmware" |
137 | NO_GENERIC_LICENSE[Firmware-cw1200] = "LICENCE.cw1200" | 139 | NO_GENERIC_LICENSE[Firmware-cw1200] = "LICENCE.cw1200" |
140 | NO_GENERIC_LICENSE[Firmware-cypress] = "LICENCE.cypress" | ||
138 | NO_GENERIC_LICENSE[Firmware-dib0700] = "LICENSE.dib0700" | 141 | NO_GENERIC_LICENSE[Firmware-dib0700] = "LICENSE.dib0700" |
139 | NO_GENERIC_LICENSE[Firmware-e100] = "LICENCE.e100" | 142 | NO_GENERIC_LICENSE[Firmware-e100] = "LICENCE.e100" |
140 | NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware" | 143 | NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware" |
@@ -233,6 +236,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ | |||
233 | ${PN}-vt6656-license ${PN}-vt6656 \ | 236 | ${PN}-vt6656-license ${PN}-vt6656 \ |
234 | ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ | 237 | ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ |
235 | ${PN}-rtl8168 \ | 238 | ${PN}-rtl8168 \ |
239 | ${PN}-cypress-license \ | ||
236 | ${PN}-broadcom-license \ | 240 | ${PN}-broadcom-license \ |
237 | ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 \ | 241 | ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 \ |
238 | ${PN}-bcm43362 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \ | 242 | ${PN}-bcm43362 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \ |
@@ -556,6 +560,14 @@ RDEPENDS_${PN}-bcm4339 += "${PN}-broadcom-license" | |||
556 | RDEPENDS_${PN}-bcm43430 += "${PN}-broadcom-license" | 560 | RDEPENDS_${PN}-bcm43430 += "${PN}-broadcom-license" |
557 | RDEPENDS_${PN}-bcm4354 += "${PN}-broadcom-license" | 561 | RDEPENDS_${PN}-bcm4354 += "${PN}-broadcom-license" |
558 | 562 | ||
563 | # For broadcom cypress | ||
564 | |||
565 | LICENSE_${PN}-cypress-license = "Firmware-cypress" | ||
566 | |||
567 | FILES_${PN}-cypress-license = "\ | ||
568 | ${nonarch_base_libdir}/firmware/LICENCE.cypress \ | ||
569 | " | ||
570 | |||
559 | # For Broadcom bnx2-mips | 571 | # For Broadcom bnx2-mips |
560 | # | 572 | # |
561 | # which is a separate case to the other Broadcom firmwares since its | 573 | # which is a separate case to the other Broadcom firmwares since its |