summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-05-03 13:20:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:33:39 +0100
commit199b348d1d0a3973477bd5feeed634a92991908f (patch)
tree16755402908506bdfded658dfa78b1a31e8d0bfc /meta/classes
parent26bf0e9bf20358bd81a0ff9e57f383fc9ba5ff09 (diff)
downloadpoky-199b348d1d0a3973477bd5feeed634a92991908f.tar.gz
image-live.bbclass: make the INITRD optional
This aligns with image-vm, and makes sense for wic bootimg-efi images, which don't actually want any of the live installer bits. (From OE-Core rev: 3d985512acdf1d7821c410d196fe372221555524) Signed-off-by: Christopher Larson <chris_larson@mentor.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.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index c8a8610604..ea6ced2dcb 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -56,7 +56,7 @@ python() {
56 if image_b == initrd_i: 56 if image_b == initrd_i:
57 bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i) 57 bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i)
58 bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.') 58 bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.')
59 else: 59 elif initrd_i:
60 d.appendVarFlag('do_bootimg', 'depends', ' %s:do_image_complete' % initrd_i) 60 d.appendVarFlag('do_bootimg', 'depends', ' %s:do_image_complete' % initrd_i)
61} 61}
62 62