[oe-commits] [openembedded-core] 17/50: image-live.bbclass: make the INITRD optional

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 3d985512acdf1d7821c410d196fe372221555524
Author: Christopher Larson <chris_larson at mentor.com>
AuthorDate: Tue May 3 13:20:35 2016 -0700

    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 at mentor.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/image-live.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index c8a8610..ea6ced2 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)
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.