summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorIan Reinhart Geiser <geiseri@geekcentral.pub>2016-04-29 08:41:49 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:33:41 +0100
commite81d7a8afe4355b2fcb28bf69ad527fa041441ab (patch)
tree5a5c580c7475402e59317668c69b07499ed1a33c /meta
parentc1ce0d9a9e200e35a9b6f9d537232875683ab9f1 (diff)
downloadpoky-e81d7a8afe4355b2fcb28bf69ad527fa041441ab.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image-vm.bbclass13
1 files changed, 7 insertions, 6 deletions
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 \
23 syslinux-native:do_populate_sysroot \ 23 syslinux-native:do_populate_sysroot \
24 parted-native:do_populate_sysroot \ 24 parted-native:do_populate_sysroot \
25 mtools-native:do_populate_sysroot \ 25 mtools-native:do_populate_sysroot \
26 ${PN}:do_image_ext4 \ 26 ${PN}:do_image_${VM_ROOTFS_TYPE} \
27 " 27 "
28 28
29IMAGE_TYPEDEP_vmdk = "ext4" 29IMAGE_TYPEDEP_vmdk = "${VM_ROOTFS_TYPE}"
30IMAGE_TYPEDEP_vdi = "ext4" 30IMAGE_TYPEDEP_vdi = "${VM_ROOTFS_TYPE}"
31IMAGE_TYPEDEP_qcow2 = "ext4" 31IMAGE_TYPEDEP_qcow2 = "${VM_ROOTFS_TYPE}"
32IMAGE_TYPEDEP_hdddirect = "ext4" 32IMAGE_TYPEDEP_hdddirect = "${VM_ROOTFS_TYPE}"
33IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect" 33IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect"
34 34
35ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" 35VM_ROOTFS_TYPE ?= "ext4"
36ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${VM_ROOTFS_TYPE}"
36 37
37# Used by bootloader 38# Used by bootloader
38LABELS_VM ?= "boot" 39LABELS_VM ?= "boot"