From e81d7a8afe4355b2fcb28bf69ad527fa041441ab Mon Sep 17 00:00:00 2001 From: Ian Reinhart Geiser Date: Fri, 29 Apr 2016 08:41:49 -0400 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/image-vm.bbclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'meta/classes/image-vm.bbclass') diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass index 47f73261f1..2bbd9d3671 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" -- cgit v1.2.3-54-g00ecf