diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-09-01 11:56:00 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-04 00:07:28 +0100 |
commit | 9cc449273252314fdc88cd62deb18a3e03d8abd5 (patch) | |
tree | 7be59be75f83dc27aaf1cc8b1e816bce1f03c434 /meta/classes/image-live.bbclass | |
parent | 619d2996fbb12e6ab63daa73b2d9683023cc2744 (diff) | |
download | poky-9cc449273252314fdc88cd62deb18a3e03d8abd5.tar.gz |
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>
Diffstat (limited to 'meta/classes/image-live.bbclass')
-rw-r--r-- | meta/classes/image-live.bbclass | 12 |
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" | |||
43 | INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs" | 43 | INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs" |
44 | INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz" | 44 | INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz" |
45 | 45 | ||
46 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" | 46 | ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4" |
47 | 47 | ||
48 | IMAGE_TYPEDEP_live = "ext4" | 48 | IMAGE_TYPEDEP_live = "ext4" |
49 | IMAGE_TYPEDEP_iso = "ext4" | 49 | IMAGE_TYPEDEP_iso = "ext4" |
@@ -144,14 +144,14 @@ build_iso() { | |||
144 | if [ "${PCBIOS}" = "1" ] && [ "${EFI}" != "1" ] ; then | 144 | if [ "${PCBIOS}" = "1" ] && [ "${EFI}" != "1" ] ; then |
145 | # PCBIOS only media | 145 | # PCBIOS only media |
146 | mkisofs -V ${BOOTIMG_VOLUME_ID} \ | 146 | mkisofs -V ${BOOTIMG_VOLUME_ID} \ |
147 | -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \ | 147 | -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \ |
148 | -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ | 148 | -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ |
149 | $mkisofs_compress_opts \ | 149 | $mkisofs_compress_opts \ |
150 | ${MKISOFS_OPTIONS} $mkisofs_iso_level ${ISODIR} | 150 | ${MKISOFS_OPTIONS} $mkisofs_iso_level ${ISODIR} |
151 | else | 151 | else |
152 | # EFI only OR EFI+PCBIOS | 152 | # EFI only OR EFI+PCBIOS |
153 | mkisofs -A ${BOOTIMG_VOLUME_ID} -V ${BOOTIMG_VOLUME_ID} \ | 153 | mkisofs -A ${BOOTIMG_VOLUME_ID} -V ${BOOTIMG_VOLUME_ID} \ |
154 | -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \ | 154 | -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \ |
155 | -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ | 155 | -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ |
156 | $mkisofs_compress_opts ${MKISOFS_OPTIONS} $mkisofs_iso_level \ | 156 | $mkisofs_compress_opts ${MKISOFS_OPTIONS} $mkisofs_iso_level \ |
157 | -eltorito-alt-boot -eltorito-platform efi \ | 157 | -eltorito-alt-boot -eltorito-platform efi \ |
@@ -160,7 +160,7 @@ build_iso() { | |||
160 | isohybrid_args="-u" | 160 | isohybrid_args="-u" |
161 | fi | 161 | fi |
162 | 162 | ||
163 | isohybrid $isohybrid_args ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso | 163 | isohybrid $isohybrid_args ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso |
164 | } | 164 | } |
165 | 165 | ||
166 | build_fat_img() { | 166 | build_fat_img() { |
@@ -252,13 +252,13 @@ build_hddimg() { | |||
252 | fi | 252 | fi |
253 | fi | 253 | fi |
254 | 254 | ||
255 | build_fat_img ${HDDDIR} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg | 255 | build_fat_img ${HDDDIR} ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg |
256 | 256 | ||
257 | if [ "${PCBIOS}" = "1" ]; then | 257 | if [ "${PCBIOS}" = "1" ]; then |
258 | syslinux_hddimg_install | 258 | syslinux_hddimg_install |
259 | fi | 259 | fi |
260 | 260 | ||
261 | chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg | 261 | chmod 644 ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg |
262 | fi | 262 | fi |
263 | } | 263 | } |
264 | 264 | ||