From eb597c0e7969112e97b1ad130c7be59c33726c04 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 12 Sep 2016 17:19:18 -0300 Subject: 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 --- classes/image_types_fsl.bbclass | 2 +- conf/machine/include/imx-base.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index 5f3a9c6..9a65747 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 b54b7f5..c93eeea 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" -- cgit v1.2.3-54-g00ecf