From 90a3b95eb1f6279fd9b5322d93b3a8f5b1344480 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 17 Mar 2014 10:34:08 -0300 Subject: 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 Reported-by: Tarek El-Sherbiny Signed-off-by: Otavio Salvador --- classes/image_types_fsl.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes') 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" -- cgit v1.2.3-54-g00ecf