diff options
Diffstat (limited to 'meta')
-rw-r--r-- | 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 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" | |||
43 | INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs" | 43 | INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs" |
44 | INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz" | 44 | INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz" |
45 | 45 | ||
46 | ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4" | 46 | LIVE_ROOTFS_TYPE ?= "ext4" |
47 | ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" | ||
47 | 48 | ||
48 | IMAGE_TYPEDEP_live = "ext4" | 49 | IMAGE_TYPEDEP_live = "${LIVE_ROOTFS_TYPE}" |
49 | IMAGE_TYPEDEP_iso = "ext4" | 50 | IMAGE_TYPEDEP_iso = "${LIVE_ROOTFS_TYPE}" |
50 | IMAGE_TYPEDEP_hddimg = "ext4" | 51 | IMAGE_TYPEDEP_hddimg = "${LIVE_ROOTFS_TYPE}" |
51 | IMAGE_TYPES_MASKED += "live hddimg iso" | 52 | IMAGE_TYPES_MASKED += "live hddimg iso" |
52 | 53 | ||
53 | python() { | 54 | python() { |