summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2016-09-01 14:50:38 +0200
committerAnton Gerasimov <anton@advancedtelematic.com>2016-09-01 14:50:38 +0200
commit137845ad1a64c93d8bead1e8f1448d56e7bfee07 (patch)
tree1ba6469d284e7f876ea762c4d504dc422387dc07
parentdf72ee883ec73cab47cfaa23e0f2feff9f1d2862 (diff)
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 <anton@advancedtelematic.com>
-rw-r--r--meta-sota/classes/image_types_ota.bbclass1
-rw-r--r--templates/feature/agl-sota/50_local.conf.inc2
2 files changed, 2 insertions, 1 deletions
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"