[gnome-continuous-yocto/gnomeostree-3.28-rocko: 139/8267] image-live.bbclass: make the INITRD optional
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 139/8267] image-live.bbclass: make the INITRD optional
- Date: Sat, 16 Dec 2017 20:00:29 +0000 (UTC)
commit 199b348d1d0a3973477bd5feeed634a92991908f
Author: Christopher Larson <chris_larson mentor com>
Date: 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.
(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>
meta/classes/image-live.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
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)
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]