summaryrefslogtreecommitdiffstats
path: root/meta/classes
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-11 16:59:19 +0100
commitf9eff2eebf119d8b1894af2b658a9147f5901727 (patch)
tree43f7307cb75ddc03267b68facb477e60ae061638 /meta/classes
parent0cff8d03ffa08efe1e8e9bf6aea37ecd8336cd6f (diff)
downloadpoky-f9eff2eebf119d8b1894af2b658a9147f5901727.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. (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>
Diffstat (limited to 'meta/classes')
-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 \
34 ${MLPREFIX}syslinux:do_populate_sysroot \ 34 ${MLPREFIX}syslinux:do_populate_sysroot \
35 syslinux-native:do_populate_sysroot \ 35 syslinux-native:do_populate_sysroot \
36 ${@oe.utils.ifelse(d.getVar('COMPRESSISO', False),'zisofs-tools-native:do_populate_sysroot','')} \ 36 ${@oe.utils.ifelse(d.getVar('COMPRESSISO', False),'zisofs-tools-native:do_populate_sysroot','')} \
37 ${PN}:do_image_ext4 \ 37 ${PN}:do_image_${LIVE_ROOTFS_TYPE} \
38 " 38 "
39 39
40 40
@@ -43,11 +43,12 @@ ROOT_LIVE ?= "root=/dev/ram0"
43INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs" 43INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
44INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz" 44INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
45 45
46ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4" 46LIVE_ROOTFS_TYPE ?= "ext4"
47ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}"
47 48
48IMAGE_TYPEDEP_live = "ext4" 49IMAGE_TYPEDEP_live = "${LIVE_ROOTFS_TYPE}"
49IMAGE_TYPEDEP_iso = "ext4" 50IMAGE_TYPEDEP_iso = "${LIVE_ROOTFS_TYPE}"
50IMAGE_TYPEDEP_hddimg = "ext4" 51IMAGE_TYPEDEP_hddimg = "${LIVE_ROOTFS_TYPE}"
51IMAGE_TYPES_MASKED += "live hddimg iso" 52IMAGE_TYPES_MASKED += "live hddimg iso"
52 53
53python() { 54python() {