[RFC v2 14/19] vm images: make compatible with rootless build

["'Felix Moessbauer' via isar-users" <isar-users@googlegroups.com>]

We rework the conversion of the VM images to be compatible with the
two-stage deploy. By that, they can be generated under rootless as well.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes-recipe/imagetypes_vm.bbclass | 29 +++++++++++++----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/meta/classes-recipe/imagetypes_vm.bbclass b/meta/classes-recipe/imagetypes_vm.bbclass
index 4057361e..3f914e4d 100644
--- a/meta/classes-recipe/imagetypes_vm.bbclass
+++ b/meta/classes-recipe/imagetypes_vm.bbclass
@@ -19,8 +19,11 @@ SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic"
 VMDK_SUBFORMAT ?= "monolithicSparse"
 
 VIRTUAL_MACHINE_IMAGE_TYPE ?= "vmdk"
+
+PP_STAGE = "${PP_WORK}/deploy-image-ova"
 VIRTUAL_MACHINE_IMAGE_FILE = "${IMAGE_FULLNAME}-disk001.${VIRTUAL_MACHINE_IMAGE_TYPE}"
-VIRTUAL_MACHINE_DISK = "${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE}"
+VIRTUAL_MACHINE_DISK_DEPLOY = "${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE}"
+VIRTUAL_MACHINE_DISK_STAGE = "${PP_STAGE}/${VIRTUAL_MACHINE_IMAGE_FILE}"
 
 def set_convert_options(d):
    format = d.getVar("VIRTUAL_MACHINE_IMAGE_TYPE")
@@ -35,9 +38,10 @@ CONVERSION_OPTIONS = "${@set_convert_options(d)}"
 convert_wic() {
     rm -f '${DEPLOY_DIR_IMAGE}/${VIRTUAL_MACHINE_IMAGE_FILE}'
     bbnote "Creating ${VIRTUAL_MACHINE_IMAGE_FILE} from ${SOURCE_IMAGE_FILE}"
-    imager_run -p -d ${PP_WORK} -- \
-    /usr/bin/qemu-img convert -f raw -O ${VIRTUAL_MACHINE_IMAGE_TYPE} ${CONVERSION_OPTIONS} \
-        '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${VIRTUAL_MACHINE_DISK}'
+    export IMAGE_STAGE_HOST=${WORKDIR}/deploy-image-ova/${VIRTUAL_MACHINE_IMAGE_FILE}
+    ${SUDO_CHROOT} \
+        /usr/bin/qemu-img convert -f raw -O ${VIRTUAL_MACHINE_IMAGE_TYPE} ${CONVERSION_OPTIONS} \
+            '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${VIRTUAL_MACHINE_DISK_STAGE}'
 }
 
 # User settings for OVA
@@ -78,23 +82,24 @@ IMAGE_CMD:ova() {
     export LAST_CHANGE=$(date -u "+%Y-%m-%dT%H:%M:%SZ")
     export OVA_FIRMWARE_UPPERCASE=$(echo ${OVA_FIRMWARE} | tr '[a-z]' '[A-Z]')
     export OVF_TEMPLATE_STAGE2=$(echo ${OVF_TEMPLATE_FILE} | sed 's/.tmpl$//' )
-    imager_run -p -d ${PP_WORK} <<'EOIMAGER'
+    ${SUDO_CHROOT} /bin/bash -s <<'EOIMAGER'
         set -e
-        export DISK_SIZE_BYTES=$(qemu-img info -f vmdk "${VIRTUAL_MACHINE_DISK}" \
+        export DISK_SIZE_BYTES=$(qemu-img info -f vmdk "${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE}" \
                                  | gawk 'match($0, /^virtual size:.*\(([0-9]+) bytes\)/, a) {print a[1]}')
         export DISK_UUID=$(uuidgen)
         export VM_UUID=$(uuidgen)
         # create ovf
-        cat ${PP_WORK}/${OVF_TEMPLATE_STAGE2} | envsubst > ${PP_DEPLOY}/${IMAGE_FULLNAME}.ovf
-        tar -cvf ${PP_DEPLOY}/${IMAGE_FULLNAME}.ova -C ${PP_DEPLOY} ${IMAGE_FULLNAME}.ovf
+        cat ${PP_WORK}/${OVF_TEMPLATE_STAGE2} | envsubst > ${PP_STAGE}/${IMAGE_FULLNAME}.ovf
+        tar -cvf ${PP_STAGE}/${IMAGE_FULLNAME}.ova -C ${PP_STAGE} ${IMAGE_FULLNAME}.ovf
 
         # VirtualBox needs here a manifest file. VMware does accept that format.
         if [ "${VMDK_SUBFORMAT}" = "monolithicSparse" ]; then
-            echo "SHA${OVA_SHA_ALG}(${VIRTUAL_MACHINE_IMAGE_FILE})=$(sha${OVA_SHA_ALG}sum ${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE} | cut -d' ' -f1)" >> ${PP_DEPLOY}/${IMAGE_FULLNAME}.mf
-            echo "SHA${OVA_SHA_ALG}(${IMAGE_FULLNAME}.ovf)=$(sha${OVA_SHA_ALG}sum ${PP_DEPLOY}/${IMAGE_FULLNAME}.ovf | cut -d' ' -f1)" >> ${PP_DEPLOY}/${IMAGE_FULLNAME}.mf
-            tar -uvf ${PP_DEPLOY}/${IMAGE_FULLNAME}.ova -C ${PP_DEPLOY} ${IMAGE_FULLNAME}.mf
+            echo "SHA${OVA_SHA_ALG}(${VIRTUAL_MACHINE_IMAGE_FILE})=$(sha${OVA_SHA_ALG}sum ${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE} | cut -d' ' -f1)" >> ${PP_STAGE}/${IMAGE_FULLNAME}.mf
+            echo "SHA${OVA_SHA_ALG}(${IMAGE_FULLNAME}.ovf)=$(sha${OVA_SHA_ALG}sum ${PP_STAGE}/${IMAGE_FULLNAME}.ovf | cut -d' ' -f1)" >> ${PP_STAGE}/${IMAGE_FULLNAME}.mf
+            tar -uvf ${PP_STAGE}/${IMAGE_FULLNAME}.ova -C ${PP_STAGE} ${IMAGE_FULLNAME}.mf
         fi
-        tar -uvf ${PP_DEPLOY}/${IMAGE_FULLNAME}.ova -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE}
+        tar -uvf ${PP_STAGE}/${IMAGE_FULLNAME}.ova --owner=0 --group=0 --numeric-owner -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE}
 EOIMAGER
+    rm -f ${DEPLOY_DIR_IMAGE}/${VIRTUAL_MACHINE_IMAGE_FILE}
 }
 IMAGE_CMD:ova[depends] = "${PN}:do_transform_template"
-- 
2.51.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260220171601.3845113-15-felix.moessbauer%40siemens.com.