From e4bc8c7058fbf27969a967a5e30f15fcf22544bd Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Tue, 11 Apr 2017 14:39:01 +0200 Subject: Set default OSTREE_BOOTLOADER in bbclass Bug-AGL: SPEC-529 Change-Id: I27c6925e9ce3027b405ae7f67bac3234ab79a9ad Signed-off-by: Anton Gerasimov --- meta-sota/classes/image_types_ota.bbclass | 2 ++ meta-sota/conf/include/agl-sota.inc | 1 + 2 files changed, 3 insertions(+) diff --git a/meta-sota/classes/image_types_ota.bbclass b/meta-sota/classes/image_types_ota.bbclass index 58bc7f0..d2d9991 100644 --- a/meta-sota/classes/image_types_ota.bbclass +++ b/meta-sota/classes/image_types_ota.bbclass @@ -9,6 +9,8 @@ inherit image +OSTREE_BOOTLOADER ??= 'u-boot' + IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \ ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" diff --git a/meta-sota/conf/include/agl-sota.inc b/meta-sota/conf/include/agl-sota.inc index 700d36a..9e8e794 100644 --- a/meta-sota/conf/include/agl-sota.inc +++ b/meta-sota/conf/include/agl-sota.inc @@ -19,6 +19,7 @@ IMAGE_FSTYPES_remove_raspberrypi2 = "wic" # Still to be integrared IMAGE_FSTYPES_remove_cyclone5 = "wic" IMAGE_FSTYPES_remove_dra7xx-evm = "wic" +IMAGE_FSTYPES_remove_dragonboard-410c = "wic" IMAGE_FSTYPES_remove_h3ulcb = "wic" IMAGE_FSTYPES_remove_intel-corei7-64 = "wic" IMAGE_FSTYPES_remove_joule = "wic" -- cgit 1.2.3-korg