Merge pull request #55 from advancedtelematic/switchupdater

Merge changes required by AGL

3 files changed, 8 insertions, 8 deletions

diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 819a83c..cb71899 100644
--- a/classes/image_types_ota.bbclass
+++ b/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/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index a7d3aae..e334df0 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -5,19 +5,16 @@ IMAGE_INSTALL_append = " ostree os-release rvi-sota-client"
 
 # live image for OSTree-enabled systems
 IMAGE_CLASSES += "image_types_ostree image_types_ota"
-IMAGE_FSTYPES += "ostreepush otaimg wic"
+IMAGE_FSTYPES += "ostreepush otaimg"
+
+# if don't build wic image unless IMAGE_BOOT_FILES is set. Prevents build from failing
+#   on machines that don't support updater yet
+IMAGE_FSTYPES += "${@' wic' if (d.getVar("IMAGE_BOOT_FILES", True)) else ''}"
 WKS_FILE ?= "sdimage-sota.wks"
 do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg"
 
 EXTRA_IMAGEDEPENDS += " parted-native mtools-native dosfstools-native"
 
-# No working WKS for Raspberry Pi yet
-IMAGE_FSTYPES_remove_raspberrypi3 = "wic"
-IMAGE_FSTYPES_remove_raspberrypi2 = "wic"
-
-# QEMU emulation uses plain otaimg, no wic needed
-IMAGE_FSTYPES_remove_qemux86-64 = "wic"
-
 # Please redefine OSTREE_REPO in order to have a persistent OSTree repo
 OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
 OSTREE_BRANCHNAME ?= "ota-${MACHINE}"
diff --git a/recipes-core/images/initramfs-ostree-image.bb b/recipes-core/images/initramfs-ostree-image.bb
index 8eea07c..509b74d 100644
--- a/recipes-core/images/initramfs-ostree-image.bb
+++ b/recipes-core/images/initramfs-ostree-image.bb
@@ -15,6 +15,7 @@ LICENSE = "MIT"
 
 IMAGE_FSTYPES = "ext4.gz"
 IMAGE_FSTYPES_append_arm = " ext4.gz.u-boot"
+IMAGE_CLASSES_append_arm = " image_types_uboot"
 
 inherit core-image