diff options
| -rw-r--r-- | meta/classes/image-live.bbclass | 11 |
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} " ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" -do_bootimg[depends] += "${INITRD_IMAGE}:do_image_complete" do_bootimg[depends] += "${PN}:do_image_ext4" inherit bootimg @@ -18,3 +17,13 @@ IMAGE_TYPEDEP_live = "ext4" IMAGE_TYPEDEP_iso = "ext4" IMAGE_TYPEDEP_hddimg = "ext4" IMAGE_TYPES_MASKED += "live hddimg iso" + +python() { + image_b = d.getVar('IMAGE_BASENAME', True) + initrd_i = d.getVar('INITRD_IMAGE', True) + if image_b == initrd_i: + bb.error('INITRD_IMAGE %s cannot use image live, hddimg or iso.' % initrd_i) + bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.') + else: + d.appendVarFlag('do_bootimg', 'depends', ' %s:do_image_complete' % initrd_i) +} |