summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Ylinen <mikko.ylinen@linux.intel.com>2017-10-10 15:27:06 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-20 22:52:14 +0000
commitd6c1dc86737e6f67bfc5c0e6ee0a725397f11371 (patch)
tree4ddc60d1af274fc0286ffb32eb7499a2628476be
parent457495e289cdd4b7859958043f55fe59038a5afa (diff)
downloadopenembedded-core-contrib-d6c1dc86737e6f67bfc5c0e6ee0a725397f11371.tar.gz
openembedded-core-contrib-d6c1dc86737e6f67bfc5c0e6ee0a725397f11371.tar.bz2
openembedded-core-contrib-d6c1dc86737e6f67bfc5c0e6ee0a725397f11371.zip
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. Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 229f70a5f6d29d82e1a7b1f780e2149fb91d5385) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-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 90fec0aac3..6f0dfad472 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -554,7 +554,9 @@ FILES_${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE"
RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license"
# For imx-sdma
-LICENSE_${PN}-imx-sdma = "Firmware-imx-sdma_firmware"
+LICENSE_${PN}-imx-sdma-imx6q = "Firmware-imx-sdma_firmware"
+LICENSE_${PN}-imx-sdma-imx7d = "Firmware-imx-sdma_firmware"
+LICENSE_${PN}-imx-sdma-license = "Firmware-imx-sdma_firmware"
FILES_${PN}-imx-sdma-imx6q = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin"
@@ -564,6 +566,11 @@ RCONFLICTS_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q"
FILES_${PN}-imx-sdma-imx7d = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin"
+FILES_${PN}-imx-sdma-license = "${nonarch_base_libdir}/firmware/LICENSE.sdma_firmware"
+
+RDEPENDS_${PN}-imx-sdma-imx6q += "${PN}-imx-sdma-license"
+RDEPENDS_${PN}-imx-sdma-imx7d += "${PN}-imx-sdma-license"
+
# For iwlwifi
LICENSE_${PN}-iwlwifi = "Firmware-iwlwifi_firmware"
LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware"