diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-07-20 09:40:22 +0000 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.com> | 2018-07-20 16:41:37 +0100 |
| commit | effb6afeff69bd8ce2beb6a64cee85ab94f3687b (patch) | |
| tree | 39ddc784caa2add64f729064e91b9d63312e1b04 | |
| parent | 7cd27ce83e19fbc780fc0fff2c5bde864c0293f7 (diff) | |
| download | meta-raspberrypi-effb6afeff69bd8ce2beb6a64cee85ab94f3687b.tar.gz | |
linux-firmware: move ${PN}-cypress-license handling to oe-core recipe
* this will make this bbappend a bit more version agnostic
* depends on oe-core commits from:
http://lists.openembedded.org/pipermail/openembedded-core/2018-July/153164.html
to prevent including ${PN}-cypress-license package twice in PACKAGES
http://lists.openembedded.org/pipermail/openembedded-core/2018-July/153165.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index 8157d25..8deac40 100644 --- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend | |||
| @@ -3,15 +3,6 @@ | |||
| 3 | # https://github.com/RPi-Distro/firmware-nonfree | 3 | # https://github.com/RPi-Distro/firmware-nonfree |
| 4 | # https://github.com/RPi-Distro/bluez-firmware | 4 | # https://github.com/RPi-Distro/bluez-firmware |
| 5 | 5 | ||
| 6 | LICENSE_append_rpi = "\ | ||
| 7 | & Firmware-cypress \ | ||
| 8 | " | ||
| 9 | |||
| 10 | LIC_FILES_CHKSUM_append_rpi = "\ | ||
| 11 | file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \ | ||
| 12 | " | ||
| 13 | NO_GENERIC_LICENSE[Firmware-cypress] = "LICENCE.cypress" | ||
| 14 | |||
| 15 | SRC_URI_append_rpi = " \ | 6 | SRC_URI_append_rpi = " \ |
| 16 | git://github.com/RPi-Distro/firmware-nonfree;destsuffix=raspbian-nf;name=raspbian-nf \ | 7 | git://github.com/RPi-Distro/firmware-nonfree;destsuffix=raspbian-nf;name=raspbian-nf \ |
| 17 | git://github.com/RPi-Distro/bluez-firmware;destsuffix=raspbian-bluez;name=raspbian-bluez \ | 8 | git://github.com/RPi-Distro/bluez-firmware;destsuffix=raspbian-bluez;name=raspbian-bluez \ |
| @@ -41,7 +32,6 @@ do_install_append_rpi() { | |||
| 41 | # the roll-up package which precedes them. | 32 | # the roll-up package which precedes them. |
| 42 | PACKAGES_prepend_rpi = "\ | 33 | PACKAGES_prepend_rpi = "\ |
| 43 | ${PN}-bcm43455 \ | 34 | ${PN}-bcm43455 \ |
| 44 | ${PN}-cypress-license \ | ||
| 45 | ${PN}-bcm43430a1-hcd \ | 35 | ${PN}-bcm43430a1-hcd \ |
| 46 | ${PN}-bcm4345c0-hcd \ | 36 | ${PN}-bcm4345c0-hcd \ |
| 47 | " | 37 | " |
| @@ -58,11 +48,6 @@ FILES_${PN}-bcm43455 = " \ | |||
| 58 | 48 | ||
| 59 | RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" | 49 | RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" |
| 60 | 50 | ||
| 61 | # For additional Cypress | ||
| 62 | FILES_${PN}-cypress-license = "\ | ||
| 63 | ${nonarch_base_libdir}/firmware/LICENCE.cypress \ | ||
| 64 | " | ||
| 65 | |||
| 66 | LICENSE_${PN}-bcm43430a1-hcd = "Firmware-cypress" | 51 | LICENSE_${PN}-bcm43430a1-hcd = "Firmware-cypress" |
| 67 | LICENSE_${PN}-bcm4345c0-hcd = "Firmware-cypress" | 52 | LICENSE_${PN}-bcm4345c0-hcd = "Firmware-cypress" |
| 68 | 53 | ||
