From 406d424abca8bc0aa14c5fea115cfffb7d2939a0 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Wed, 19 Oct 2016 10:48:21 +0200 Subject: 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 --- meta-sota/classes/image_types_ota.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-sota/classes/image_types_ota.bbclass b/meta-sota/classes/image_types_ota.bbclass index b9126ec..253d862 100644 --- a/meta-sota/classes/image_types_ota.bbclass +++ b/meta-sota/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 -- cgit 1.2.3-korg