From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 12 Sep 2016 20:19:18 +0000 (-0300)
Subject: Use IMGDEPLOYDIR for SDCard image generation
X-Git-Tag: 2.2~254
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9d18977b9b4507f7a931570bb157093344b0c4a1;p=meta-freescale.git

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 5f3a9c69..9a65747a 100644
--- 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 b54b7f57..c93eeead 100644
--- 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"