From 137845ad1a64c93d8bead1e8f1448d56e7bfee07 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 1 Sep 2016 14:50:38 +0200 Subject: Force u-boot (or another virtual/bootloader if overriden by user) to build with otaimg Bug-AGL: SPEC-236 Change-Id: I60f5b535467819cd03a591a12b725f2d7fc2cd31 Signed-off-by: Anton Gerasimov --- meta-sota/classes/image_types_ota.bbclass | 1 + templates/feature/agl-sota/50_local.conf.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-sota/classes/image_types_ota.bbclass b/meta-sota/classes/image_types_ota.bbclass index 9820724..cc526b6 100644 --- a/meta-sota/classes/image_types_ota.bbclass +++ b/meta-sota/classes/image_types_ota.bbclass @@ -12,6 +12,7 @@ export BOOTFS_EXTRA_SIZE do_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \ parted-native:do_populate_sysroot \ virtual/kernel:do_deploy \ + virtual/bootloader:do_deploy \ ${INITRD_IMAGE}:do_rootfs \ ${PN}:do_rootfs" diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc index a27d7af..d2bab53 100644 --- a/templates/feature/agl-sota/50_local.conf.inc +++ b/templates/feature/agl-sota/50_local.conf.inc @@ -5,7 +5,7 @@ IMAGE_CLASSES += "image_types_ota" IMAGE_FSTYPES += "otaimg" UBOOT_MACHINE_qemux86 = "qemu-x86_defconfig" -UBOOT_MACHINE_qemux86_64 = "qemu-x86_defconfig" +UBOOT_MACHINE_qemux86-64 = "qemu-x86_defconfig" PREFERRED_PROVIDER_virtual/bootloader_qemux86 ?= "u-boot-ota" PREFERRED_PROVIDER_virtual/bootloader_qemux86-64 ?= "u-boot-ota" -- cgit 1.2.3-korg