From 89c9af1ea32d13135d1df8aebc29b4d2acc96c29 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Tue, 6 Nov 2018 17:24:01 +0100
Subject: [PATCH] imx-boot: make do_populate_lic depend on packages dependant

When the imx-boot recipe is added in EXTRA_IMAGEDEPENDS the
license file is being referenced in image postcommand
write_deploy_manifest, but the licenses of the dependant
packages are missing. This leads to the license files of the
recipes to be missing when write_deploy_manifest runs,
causing build errors to appear.

https://jira.digi.com/browse/DEL-6251

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../recipes-bsp/imx-mkimage/imx-boot_0.2.bb      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
index 6d5f2d81d..b3e817eeb 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
@@ -37,8 +37,8 @@ DEPENDS_append_mx8mq = " dtc-native"
 # that would otherwise be done in the image build as controlled
 # by IMAGE_BOOTFILES_DEPENDS and IMAGE_BOOTFILES in image_types_fsl.bbclass
 IMX_M4_DEMOS        = ""
-IMX_M4_DEMOS_mx8qm  = "imx-m4-demos:do_deploy"
-IMX_M4_DEMOS_mx8qxp = "imx-m4-demos:do_deploy"
+IMX_M4_DEMOS_mx8qm  = "imx-m4-demos"
+IMX_M4_DEMOS_mx8qxp = "imx-m4-demos"
 
 # This package aggregates output deployed by other packages,
 # so set the appropriate dependencies
@@ -46,10 +46,20 @@ do_compile[depends] += " \
     virtual/bootloader:do_deploy \
     ${@' '.join('%s:do_deploy' % r for r in '${IMX_FIRMWARE}'.split() )} \
     imx-atf:do_deploy \
-    ${IMX_M4_DEMOS} \
+    ${@' '.join('%s:do_deploy' % r for r in '${IMX_M4_DEMOS}'.split() )} \
     ${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'optee-os-imx:do_deploy', '', d)} \
 "
 
+# This package aggregates dependencies with other packages,
+# so also define the license dependencies.
+do_populate_lic[depends] += " \
+    virtual/bootloader:do_populate_lic \
+    ${@' '.join('%s:do_populate_lic' % r for r in '${IMX_FIRMWARE}'.split() )} \
+    imx-atf:do_populate_lic \
+    ${@' '.join('%s:do_populate_lic' % r for r in '${IMX_M4_DEMOS}'.split() )} \
+    ${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'optee-os-imx:do_populate_lic', '', d)} \
+"
+
 SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
 
 ATF_MACHINE_NAME ?= "bl31-imx8qm.bin"