From 70017f6f61df31c361f4a0206023fa486af0eb2e Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 7 Sep 2017 14:38:38 +0200 Subject: new method to generate qcow2 images image-vm generated qcow2 imaged using hddimg as intermediate image and to generate that hddimg it needs syslinux. But syslinux is only availbale for x86 architecture. A simpler method is to use ext4 as intermediate image. Signed-off-by: Adrian Calianu Signed-off-by: Adrian Dudau Signed-off-by: Martin Borg --- images/build-qcow-image.inc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/images/build-qcow-image.inc b/images/build-qcow-image.inc index deace60..1409edc 100644 --- a/images/build-qcow-image.inc +++ b/images/build-qcow-image.inc @@ -1,10 +1,16 @@ -inherit image-vm -IMAGE_FSTYPES += "qcow2" +IMAGE_TYPES += "ext4.qcow2" +CONVERSIONTYPES += "qcow2" +CONVERSION_DEPENDS_qcow2 = "qemu-native" +CONVERSION_CMD_qcow2 = "qemu-img convert -O qcow2 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.qcow2" + +IMAGE_FSTYPES += "ext4.qcow2" # To reduce storage size remove the intermediate images do_clean_unused_img() { - rm ${IMGDEPLOYDIR}/*.hdddirect - rm ${IMGDEPLOYDIR}/*.ext4 + cd ${IMGDEPLOYDIR} + ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.qcow2 ${IMAGE_LINK_NAME}.qcow2 + rm -f ${IMGDEPLOYDIR}/*.ext4 + cd - } -addtask clean_unused_img after do_vmimg before do_image_complete +addtask clean_unused_img after do_image_ext4 before do_image_complete -- cgit v1.2.3-54-g00ecf