[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5806/8267] classes/image_live: allow different filesystems to be used for live images

[Emmanuele Bassi <ebassi src gnome org>]

commit f9eff2eebf119d8b1894af2b658a9147f5901727
Author: Ming Liu <peter x liu external atlascopco com>
Date:   Sun Apr 23 11:22:59 2017 +0200

    classes/image_live: allow different filesystems to be used for live images
    
    The idea is copied from commit df0b217f3df2c36a32e5c4afaec36a28bfc77bbb:
    [ classes/image_vm: allow different filesystems to be used for VM images ]
    
    The same logic should apply to image_live.bbclass, to allow other
    filesystems to be used vs just ext4. The default value of ext4 is kept
    so there is no functional change unless LIVE_ROOTFS_TYPE is set in the
    inherting recipe.
    
    (From OE-Core rev: 270cd793fa2777bf15930ee4873c7b44a22ad005)
    
    Signed-off-by: Ming Liu <peter x liu external atlascopco com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image-live.bbclass |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index a3d1b4e..3a6e5f0 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -34,7 +34,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
                         ${MLPREFIX}syslinux:do_populate_sysroot \
                         syslinux-native:do_populate_sysroot \
                         ${@oe.utils.ifelse(d.getVar('COMPRESSISO', 
False),'zisofs-tools-native:do_populate_sysroot','')} \
-                        ${PN}:do_image_ext4 \
+                        ${PN}:do_image_${LIVE_ROOTFS_TYPE} \
                         "
 
 
@@ -43,11 +43,12 @@ ROOT_LIVE ?= "root=/dev/ram0"
 INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
 INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
 
-ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4"
+LIVE_ROOTFS_TYPE ?= "ext4"
+ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}"
 
-IMAGE_TYPEDEP_live = "ext4"
-IMAGE_TYPEDEP_iso = "ext4"
-IMAGE_TYPEDEP_hddimg = "ext4"
+IMAGE_TYPEDEP_live = "${LIVE_ROOTFS_TYPE}"
+IMAGE_TYPEDEP_iso = "${LIVE_ROOTFS_TYPE}"
+IMAGE_TYPEDEP_hddimg = "${LIVE_ROOTFS_TYPE}"
 IMAGE_TYPES_MASKED += "live hddimg iso"
 
 python() {