Use IMGDEPLOYDIR for SDCard image generation

This change is needed as the commit OE-Core:6d969bac (image: Deploy
images to IMGDEPLOYDIR) has changed the deployment directory from
DEPLOY_DIR_IMAGE to IMGDEPLOYDIR causing failures when using the
image_types_fsl.bbclass class.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 5f3a9c6999f7d8538dee9cc271ce7d467aae7c38..9a65747a10a30e88c763e0f71c875372a7b54cbb 100644 (file)
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -83,7 +83,7 @@ IMAGE_DEPENDS_sdcard = "parted-native:do_populate_sysroot \
                         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"
+SDCARD = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sdcard"
 
 SDCARD_GENERATION_COMMAND_mxs = "generate_mxs_sdcard"
 SDCARD_GENERATION_COMMAND_mx25 = "generate_imx_sdcard"

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b54b7f57121fee1f11728bdcab435f0fd68156e4..c93eeead670a78103983fb8be76cc5d54f7c8271 100644 (file)
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -165,7 +165,7 @@ PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 SOC_DEFAULT_IMAGE_FSTYPES = "sdcard.gz"
 SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot.mxsboot-sdcard sdcard.gz"
 
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
+SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4"
 IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
 
 SERIAL_CONSOLE = "115200 ttymxc0"