From 270cd793fa2777bf15930ee4873c7b44a22ad005 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sun, 23 Apr 2017 11:22:59 +0200 Subject: [PATCH] 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. Signed-off-by: Ming Liu Signed-off-by: Ross Burton --- meta/classes/image-live.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index a3d1b4e567..3a6e5f0e5b 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() { -- 2.40.1