[gnome-continuous-yocto/gnomeostree-3.28-rocko: 156/8267] classes/image_vm: allow different filesystems to be used for VM images.

[Emmanuele Bassi <ebassi src gnome org>]

commit e81d7a8afe4355b2fcb28bf69ad527fa041441ab
Author: Ian Reinhart Geiser <geiseri geekcentral pub>
Date:   Fri Apr 29 08:41:49 2016 -0400

    classes/image_vm: allow different filesystems to be used for VM images.
    
    This allows for things like btrfs to be used vs just ext4.
    The default value of ext4 is kept so there is no functional
    change unless VM_ROOTFS_TYPE is set in the inherting recipe.
    
    (From OE-Core rev: df0b217f3df2c36a32e5c4afaec36a28bfc77bbb)
    
    Signed-off-by: Ian Reinhart Geiser <geiseri geekcentral pub>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image-vm.bbclass |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index 47f7326..2bbd9d3 100644
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -23,16 +23,17 @@ do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \
                                syslinux-native:do_populate_sysroot \
                                parted-native:do_populate_sysroot \
                                mtools-native:do_populate_sysroot \
-                               ${PN}:do_image_ext4 \
+                               ${PN}:do_image_${VM_ROOTFS_TYPE} \
                                "
 
-IMAGE_TYPEDEP_vmdk = "ext4"
-IMAGE_TYPEDEP_vdi = "ext4"
-IMAGE_TYPEDEP_qcow2 = "ext4"
-IMAGE_TYPEDEP_hdddirect = "ext4"
+IMAGE_TYPEDEP_vmdk = "${VM_ROOTFS_TYPE}"
+IMAGE_TYPEDEP_vdi = "${VM_ROOTFS_TYPE}"
+IMAGE_TYPEDEP_qcow2 = "${VM_ROOTFS_TYPE}"
+IMAGE_TYPEDEP_hdddirect = "${VM_ROOTFS_TYPE}"
 IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect"
 
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
+VM_ROOTFS_TYPE ?= "ext4"
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${VM_ROOTFS_TYPE}"
 
 # Used by bootloader
 LABELS_VM ?= "boot"