[PATCH v2] Allow different filesystems to be used for VM images.

[PATCH v2] Allow different filesystems to be used for VM images.

[Ian Reinhart Geiser]

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.

Signed-off-by: Ian Reinhart Geiser <geiseri@geekcentral.pub>
---
 meta/classes/image-vm.bbclass | 13 +++++++------
 1 file 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"
-- 
2.8.1

Re: [PATCH v2] Allow different filesystems to be used for VM images.

[Ian Geiser]

What is the status of this patch?

 ---- On Fri, 29 Apr 2016 08:41:49 -0400 Ian Reinhart Geiser <geiseri@geekcentral.pub> wrote ---- 
 > 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. 
 >  
 > Signed-off-by: Ian Reinhart Geiser <geiseri@geekcentral.pub> 
 > --- 
 >  meta/classes/image-vm.bbclass | 13 +++++++------ 
 >  1 file 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" 
 > --  
 > 2.8.1 
 >  
 > 

Re: [PATCH v2] Allow different filesystems to be used for VM images.

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

On 3 May 2016 at 12:55, Ian Geiser <geiseri@geekcentral.pub> wrote:

> What is the status of this patch?
>

It's merged into my staging branch, so should be in master soon.

Ross

[-- Attachment #2: Type: text/html, Size: 583 bytes --]