From efba5b5e7cc386b903c201219d7e13f018f3219b Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 26 May 2017 17:03:16 +0200 Subject: [PATCH] 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 --- meta-digi-arm/classes/image_types_digi.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index 1bcb23d25..334ac0e79 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -122,9 +122,9 @@ do_image_boot_ubifs[imgsuffix] = "." # # This is needed because otherwise the IMAGE_DEPENDS_ 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_ 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)} \ " ################################################################################