Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Arturo Buzarra 2018-11-06 17:24:01 +01:00
parent 756cb10a22
commit 89c9af1ea3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
View File

@ -37,8 +37,8 @@ DEPENDS_append_mx8mq = " dtc-native"
# that would otherwise be done in the image build as controlled # that would otherwise be done in the image build as controlled
# by IMAGE_BOOTFILES_DEPENDS and IMAGE_BOOTFILES in image_types_fsl.bbclass # by IMAGE_BOOTFILES_DEPENDS and IMAGE_BOOTFILES in image_types_fsl.bbclass
IMX_M4_DEMOS = "" IMX_M4_DEMOS = ""
IMX_M4_DEMOS_mx8qm = "imx-m4-demos:do_deploy" IMX_M4_DEMOS_mx8qm = "imx-m4-demos"
IMX_M4_DEMOS_mx8qxp = "imx-m4-demos:do_deploy" IMX_M4_DEMOS_mx8qxp = "imx-m4-demos"
# This package aggregates output deployed by other packages, # This package aggregates output deployed by other packages,
# so set the appropriate dependencies # so set the appropriate dependencies
@ -46,10 +46,20 @@ do_compile[depends] += " \
virtual/bootloader:do_deploy \ virtual/bootloader:do_deploy \
${@' '.join('%s:do_deploy' % r for r in '${IMX_FIRMWARE}'.split() )} \ ${@' '.join('%s:do_deploy' % r for r in '${IMX_FIRMWARE}'.split() )} \
imx-atf:do_deploy \ 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)} \ ${@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" SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
ATF_MACHINE_NAME ?= "bl31-imx8qm.bin" ATF_MACHINE_NAME ?= "bl31-imx8qm.bin"