summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMikko Ylinen <mikko.ylinen@linux.intel.com>2017-10-10 12:27:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-16 22:52:43 (GMT)
commit258fd9fb7263bc915c7429eef220dd8ce4af66e3 (patch)
tree300b93d3af6d880897fdf72946e44289343d4064 /meta
parent3775adc02401806767bc9e60536610e1d23e1de7 (diff)
downloadpoky-258fd9fb7263bc915c7429eef220dd8ce4af66e3.tar.gz
linux-firmware: make i.MX SDMA split complete
The commit to split i.MX SDMA firmware blobs in their own packages was not complete and results in a failure when trying to install full linux-firmware: * Solver encountered 1 problem(s): * Problem 1/1: * - nothing provides linux-firmware-imx-sdma-license needed * by linux-firmware-1:0.0+git0+a61ac5cf83-r0.all * * Solution 1: * - do not ask to install a package providing linux-firmware Make the split complete by installing the license in ${PN}-imx-sdma-license and have the blob packages depend on it. (From OE-Core rev: 229f70a5f6d29d82e1a7b1f780e2149fb91d5385) Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 3cf432e..0338ba8 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -563,7 +563,9 @@ FILES_${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE"
563RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license" 563RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license"
564 564
565# For imx-sdma 565# For imx-sdma
566LICENSE_${PN}-imx-sdma = "Firmware-imx-sdma_firmware" 566LICENSE_${PN}-imx-sdma-imx6q = "Firmware-imx-sdma_firmware"
567LICENSE_${PN}-imx-sdma-imx7d = "Firmware-imx-sdma_firmware"
568LICENSE_${PN}-imx-sdma-license = "Firmware-imx-sdma_firmware"
567 569
568FILES_${PN}-imx-sdma-imx6q = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin" 570FILES_${PN}-imx-sdma-imx6q = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin"
569 571
@@ -573,6 +575,11 @@ RCONFLICTS_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q"
573 575
574FILES_${PN}-imx-sdma-imx7d = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin" 576FILES_${PN}-imx-sdma-imx7d = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin"
575 577
578FILES_${PN}-imx-sdma-license = "${nonarch_base_libdir}/firmware/LICENSE.sdma_firmware"
579
580RDEPENDS_${PN}-imx-sdma-imx6q += "${PN}-imx-sdma-license"
581RDEPENDS_${PN}-imx-sdma-imx7d += "${PN}-imx-sdma-license"
582
576# For iwlwifi 583# For iwlwifi
577LICENSE_${PN}-iwlwifi = "Firmware-iwlwifi_firmware" 584LICENSE_${PN}-iwlwifi = "Firmware-iwlwifi_firmware"
578LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware" 585LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware"