aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <peter.x.liu@external.atlascopco.com>2017-04-23 11:22:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-10 12:21:34 +0100
commit270cd793fa2777bf15930ee4873c7b44a22ad005 (patch)
tree9fa803439162881a64ad53d307d5a2fa339a5cb7
parentc9f83639242313ca04ec36b49602a8464e10dae8 (diff)
downloadopenembedded-core-contrib-270cd793fa2777bf15930ee4873c7b44a22ad005.tar.gz
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 <peter.x.liu@external.atlascopco.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/image-live.bbclass11
1 files 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() {