summaryrefslogtreecommitdiffstats
path: root/meta/classes/image-live.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/image-live.bbclass')
-rw-r--r--meta/classes/image-live.bbclass11
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index aafa7d5b23..d2314aaf0a 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -9,7 +9,6 @@ LABELS_append = " ${SYSLINUX_LABELS} "
9 9
10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" 10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
11 11
12do_bootimg[depends] += "${INITRD_IMAGE}:do_image_complete"
13do_bootimg[depends] += "${PN}:do_image_ext4" 12do_bootimg[depends] += "${PN}:do_image_ext4"
14 13
15inherit bootimg 14inherit bootimg
@@ -18,3 +17,13 @@ IMAGE_TYPEDEP_live = "ext4"
18IMAGE_TYPEDEP_iso = "ext4" 17IMAGE_TYPEDEP_iso = "ext4"
19IMAGE_TYPEDEP_hddimg = "ext4" 18IMAGE_TYPEDEP_hddimg = "ext4"
20IMAGE_TYPES_MASKED += "live hddimg iso" 19IMAGE_TYPES_MASKED += "live hddimg iso"
20
21python() {
22 image_b = d.getVar('IMAGE_BASENAME', True)
23 initrd_i = d.getVar('INITRD_IMAGE', True)
24 if image_b == initrd_i:
25 bb.error('INITRD_IMAGE %s cannot use image live, hddimg or iso.' % initrd_i)
26 bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.')
27 else:
28 d.appendVarFlag('do_bootimg', 'depends', ' %s:do_image_complete' % initrd_i)
29}