]> code.ossystems Code Review - openembedded-core.git/commitdiff
image-live.bbclass: make the INITRD optional
authorChristopher Larson <chris_larson@mentor.com>
Tue, 3 May 2016 20:20:35 +0000 (13:20 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 9 May 2016 07:03:57 +0000 (08:03 +0100)
This aligns with image-vm, and makes sense for wic bootimg-efi images, which
don't actually want any of the live installer bits.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/image-live.bbclass

index c8a8610604e178242e2af967467c01348f8c1811..ea6ced2dcb05f365c772bf19a309606bb230a1fd 100644 (file)
@@ -56,7 +56,7 @@ python() {
     if image_b == initrd_i:
         bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i)
         bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.')
-    else:
+    elif initrd_i:
         d.appendVarFlag('do_bootimg', 'depends', ' %s:do_image_complete' % initrd_i)
 }