image: Deploy images to IMGDEPLOYDIR

Changed deployment directory from DEPLOY_DIR_IMAGE to
IMGDEPLOYDIR to make sstate machinery to do final deployment and
generate manifest.

Renamed variable deploy_dir to deploy_dir_image in selftest code
to avoid confusion with DEPLOYDIR variable.

Updated the code of rootfs.py:Rootfs class to use IMGDEPLOYDIR variable
as it's now used as a new deployment destination.

(From OE-Core rev: 6d969bacc718e21a5246d4da9bf9639dcae29b02)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index f0e6647ac1..4a634dca96 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -43,7 +43,7 @@ ROOT_LIVE ?= "root=/dev/ram0"
 INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
 INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
 
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
+ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4"
 
 IMAGE_TYPEDEP_live = "ext4"
 IMAGE_TYPEDEP_iso = "ext4"
@@ -144,14 +144,14 @@ build_iso() {
         if [ "${PCBIOS}" = "1" ] && [ "${EFI}" != "1" ] ; then
                 # PCBIOS only media
                 mkisofs -V ${BOOTIMG_VOLUME_ID} \
-                        -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \
+                        -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \
                         -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \
                         $mkisofs_compress_opts \
                         ${MKISOFS_OPTIONS} $mkisofs_iso_level ${ISODIR}
         else
                 # EFI only OR EFI+PCBIOS
                 mkisofs -A ${BOOTIMG_VOLUME_ID} -V ${BOOTIMG_VOLUME_ID} \
-                        -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \
+                        -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \
                         -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \
                         $mkisofs_compress_opts ${MKISOFS_OPTIONS} $mkisofs_iso_level \
                         -eltorito-alt-boot -eltorito-platform efi \
@@ -160,7 +160,7 @@ build_iso() {
                 isohybrid_args="-u"
         fi
 
-        isohybrid $isohybrid_args ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso
+        isohybrid $isohybrid_args ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso
 }
 
 build_fat_img() {
@@ -252,13 +252,13 @@ build_hddimg() {
                         fi
                 fi
 
-                build_fat_img ${HDDDIR} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
+                build_fat_img ${HDDDIR} ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg
 
                 if [ "${PCBIOS}" = "1" ]; then
                         syslinux_hddimg_install
                 fi
 
-                chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
+                chmod 644 ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg
         fi
 }