aboutsummaryrefslogtreecommitdiffstats
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-09 08:03:57 +0100
commit3d985512acdf1d7821c410d196fe372221555524 (patch)
tree612f2bf2cbb2d7db57dc958c35f9cbbebc1ecf68 /meta/classes
parent76f061c91fd00370e33bfc3d45ff98d8b3f63c41 (diff)
downloadopenembedded-core-contrib-3d985512acdf1d7821c410d196fe372221555524.tar.gz
openembedded-core-contrib-3d985512acdf1d7821c410d196fe372221555524.tar.bz2
openembedded-core-contrib-3d985512acdf1d7821c410d196fe372221555524.zip
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>
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() {
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)
}