Patchwork [meta-fsl-arm,3/5] image_types_fsl.bbclass: Avoid wrong dependency for no bootloader

login
register
mail settings
Submitter Otavio Salvador
Date March 17, 2014, 5:23 p.m.
Message ID <1395077012-8590-3-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/68763/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - March 17, 2014, 5:23 p.m.
When IMAGE_BOOTLOADER is empty we shouldn't add '':do_deploy as
dependency as it does not exist. So handle this corner case to allow
bootloader-less images to build fine.

Change-Id: I04dc81bbb4184f79e88e1693239f2628a9819d7d
Reported-by: Ilya Smelykh <ilya.smelykh@gmail.com>
Reported-by: Tarek El-Sherbiny <tarek.elsherbiny@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 classes/image_types_fsl.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 39ceb7a..dfa55e4 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -74,7 +74,8 @@  IMAGE_ROOTFS_ALIGNMENT = "4096"
 IMAGE_DEPENDS_sdcard = "parted-native:do_populate_sysroot \
                         dosfstools-native:do_populate_sysroot \
                         mtools-native:do_populate_sysroot \
-                        virtual/kernel:do_deploy ${IMAGE_BOOTLOADER}:do_deploy"
+                        virtual/kernel:do_deploy \
+                        ${@d.getVar('IMAGE_BOOTLOADER', True) and d.getVar('IMAGE_BOOTLOADER', True) + ':do_deploy' or ''}"
 
 SDCARD = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sdcard"