From: Christopher Larson <chris_larson@mentor.com>
Date: Tue, 3 May 2016 20:20:35 +0000 (-0700)
Subject: image-live.bbclass: make the INITRD optional
X-Git-Tag: uninative-1.0~148
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3d985512acdf1d7821c410d196fe372221555524;p=openembedded-core.git

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.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

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() {
     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)
 }