Only build u-boot in otaimg for qemux86, otherwise it should be managed

by live image recipe

Bug-AGL: SPEC-296

Change-Id: Idbb00f33fd04b2a2d9fa8c615347f9b85d917d4a
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index b9126ec..253d862 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -9,8 +9,11 @@
 
 inherit image
 
-IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \
-                        virtual/bootloader:do_deploy"
+IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot"
+
+# For qemux86 u-boot is not included in any live image and is built separately
+IMAGE_DEPENDS_otaimg_append_qemux86 = " virtual/bootloader:do_deploy"
+IMAGE_DEPENDS_otaimg_append_qemux86-64 = " virtual/bootloader:do_deploy"
 
 calculate_size () {
         BASE=$1