From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 17 Mar 2014 13:34:08 +0000 (-0300)
Subject: image_types_fsl.bbclass: Avoid wrong dependency for no bootloader
X-Git-Tag: 2.1~990
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7d0b9f0ce2ba5150b9fbe79934158ba0cd83ee8f;p=meta-freescale.git

image_types_fsl.bbclass: Avoid wrong dependency for no bootloader

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>
---

diff --git a/meta-fsl-arm/classes/image_types_fsl.bbclass b/meta-fsl-arm/classes/image_types_fsl.bbclass
index 39ceb7a9..dfa55e46 100644
--- a/meta-fsl-arm/classes/image_types_fsl.bbclass
+++ b/meta-fsl-arm/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"