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

image_types class: fix build error due to missing images dependencies 

A couple of commits in poky.git broke the dependence from our boot and
recovery images to the trustfence and recovery initramfs images:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=morty&id=6c3d10ea62ad282a764da83aa701f92c6d3db6cb
http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=morty&id=99c6c878ee122a04f23ef49ea653208ca1c7aa77

This commit fixes the dependencies again, so when you build those images,
it builds first the required initramfs images.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
(cherry picked from commit efba5b5e7c)
This commit is contained in:
Javier Viguera 2017-05-26 17:03:16 +02:00 committed by Mike Engel
parent db6d57284a
commit 1eccad50b7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-digi-arm/classes/image_types_digi.bbclass
View File

@ -122,9 +122,9 @@ do_image_boot_ubifs[imgsuffix] = "."
#
# This is needed because otherwise the IMAGE_DEPENDS_<actualtype> is not used and the build fails.
#
IMAGE_TYPEDEP_boot = " \
${@bb.utils.contains('IMAGE_FSTYPES', 'boot.ubifs', 'boot.ubifs', '', d)} \
${@bb.utils.contains('IMAGE_FSTYPES', 'boot.vfat', 'boot.vfat', '', d)} \
IMAGE_DEPENDS_boot = " \
${@bb.utils.contains('IMAGE_FSTYPES', 'boot.ubifs', '${IMAGE_DEPENDS_boot.ubifs}', '', d)} \
${@bb.utils.contains('IMAGE_FSTYPES', 'boot.vfat', '${IMAGE_DEPENDS_boot.vfat}', '', d)} \
"
################################################################################
@ -198,9 +198,9 @@ do_image_recovery_ubifs[imgsuffix] = "."
#
# This is needed because otherwise the IMAGE_DEPENDS_<actualtype> is not used and the build fails.
#
IMAGE_TYPEDEP_recovery = " \
${@bb.utils.contains('IMAGE_FSTYPES', 'recovery.ubifs', 'recovery.ubifs', '', d)} \
${@bb.utils.contains('IMAGE_FSTYPES', 'recovery.vfat', 'recovery.vfat boot.vfat', '', d)} \
IMAGE_DEPENDS_recovery = " \
${@bb.utils.contains('IMAGE_FSTYPES', 'recovery.ubifs', '${IMAGE_DEPENDS_recovery.ubifs}', '', d)} \
${@bb.utils.contains('IMAGE_FSTYPES', 'recovery.vfat', '${IMAGE_DEPENDS_recovery.vfat}', '', d)} \
"
################################################################################