8 files changed, 38 insertions, 30 deletions

diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index cb71899..8108d51 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -98,7 +98,11 @@ IMAGE_CMD_otaimg () {
                 HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX`
                 tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true
                 mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
+                # Create /var/sota if it doesn't exist yet
+                mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true
                 mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true
+                # Ensure that /var/local exists (AGL symlinks /usr/local to /var/local)
+                install -d ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/local
                 rm -rf ${HOME_TMP}
 
                 # Calculate image type
diff --git a/classes/sdcard_image-rpi-ota.bbclass b/classes/sdcard_image-rpi-ota.bbclass
index f5c35a2..9022aaf 100644
--- a/classes/sdcard_image-rpi-ota.bbclass
+++ b/classes/sdcard_image-rpi-ota.bbclass
@@ -35,6 +35,7 @@ KERNEL_INITRAMFS ?= ""
 # Kernel image name
 SDIMG_OTA_KERNELIMAGE_raspberrypi  ?= "kernel.img"
 SDIMG_OTA_KERNELIMAGE_raspberrypi2 ?= "kernel7.img"
+SDIMG_OTA_KERNELIMAGE_raspberrypi3 ?= "kernel7.img"
 
 # Boot partition volume id
 BOOTDD_VOLUME_ID ?= "${MACHINE}"
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index a1a5028..d786b69 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -1,32 +1,31 @@
-DISTRO_FEATURES_append = " sota"
-OVERRIDES .= ":sota"
+python __anonymous() {
+    if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d):
+        d.appendVarFlag("do_image_wic", "depends", " %s:do_image_otaimg" % d.getVar("IMAGE_BASENAME", True))
+}
 
-IMAGE_INSTALL_append = " ostree os-release"
+OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}"
 
-# live image for OSTree-enabled systems
-IMAGE_CLASSES += "image_types_ostree image_types_ota"
-IMAGE_FSTYPES += "ostreepush otaimg"
+IMAGE_INSTALL_append_sota = " ostree os-release"
+IMAGE_CLASSES += " image_types_ostree image_types_ota"
+IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush otaimg wic', ' ', d)}"
 
-# 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"
+WKS_FILE_sota ?= "sdimage-sota.wks"
 
-EXTRA_IMAGEDEPENDS += " parted-native mtools-native dosfstools-native"
+EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native"
 
 # Please redefine OSTREE_REPO in order to have a persistent OSTree repo
 OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
-OSTREE_BRANCHNAME ?= "ota-${MACHINE}"
+# For UPTANE operation, OSTREE_BRANCHNAME must start with "${MACHINE}-"
+OSTREE_BRANCHNAME ?= "${MACHINE}-ota"
 OSTREE_OSNAME ?= "poky"
 OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
 
-SOTA_MACHINE ?= "none"
-SOTA_MACHINE_raspberrypi = "raspberrypi"
-SOTA_MACHINE_raspberrypi3 = "raspberrypi"
-SOTA_MACHINE_porter = "porter"
-SOTA_MACHINE_intel-corei7-64 = "minnowboard"
-SOTA_MACHINE_qemux86-64 = "qemux86-64"
-SOTA_MACHINE_qemux86-64 = "qemux86-64"
-SOTA_MACHINE_am335x-evm = "am335x-evm-wifi"
+SOTA_MACHINE ??="none"
+SOTA_MACHINE_raspberrypi2 ?= "raspberrypi"
+SOTA_MACHINE_raspberrypi3 ?= "raspberrypi"
+SOTA_MACHINE_porter ?= "porter"
+SOTA_MACHINE_intel-corei7-64 ?= "minnowboard"
+SOTA_MACHINE_qemux86-64 ?= "qemux86-64"
+SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi"
+
 inherit sota_${SOTA_MACHINE}
diff --git a/classes/sota_minnowboard.bbclass b/classes/sota_minnowboard.bbclass
index 970bd6a..8417348 100644
--- a/classes/sota_minnowboard.bbclass
+++ b/classes/sota_minnowboard.bbclass
@@ -1,7 +1,7 @@
 OSTREE_BOOTLOADER ?= "grub"
-EFI_PROVIDER = "grub-efi"
+EFI_PROVIDER_sota = "grub-efi"
 
-WKS_FILE = "efiimage-sota.wks"
-IMAGE_BOOT_FILES = ""
+WKS_FILE_sota = "efiimage-sota.wks"
+IMAGE_BOOT_FILES_sota = ""
 
 OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0"
diff --git a/classes/sota_minnowboard_uboot.inc b/classes/sota_minnowboard_uboot.inc
index 5097e9d..85d6a60 100644
--- a/classes/sota_minnowboard_uboot.inc
+++ b/classes/sota_minnowboard_uboot.inc
@@ -1,8 +1,8 @@
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota"
-UBOOT_MACHINE = "minnowmax_defconfig"
+PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot-ota"
+UBOOT_MACHINE_sota ?= "minnowmax_defconfig"
 
-EXTRA_IMAGEDEPENDS_append = " minnowboard-bootfiles"
-IMAGE_BOOT_FILES = "minnowboard-bootfiles/*"
+EXTRA_IMAGEDEPENDS_append_sota = " minnowboard-bootfiles"
+IMAGE_BOOT_FILES_sota ?= "minnowboard-bootfiles/*"
 
 OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda console=ttyS0,115200 console=tty0"
 
diff --git a/classes/sota_none.bbclass b/classes/sota_none.bbclass
index dc72a07..86eaf0b 100644
--- a/classes/sota_none.bbclass
+++ b/classes/sota_none.bbclass
@@ -1 +1,4 @@
 # null machine it's here to make bitbake happy when SOTA_MACHINE is undefined
+python __anonymous() {
+        bb.warn("SOTA functionality is not yet supported for your machine")
+}
diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass
index 533c11c..5ec4f69 100644
--- a/classes/sota_qemux86-64.bbclass
+++ b/classes/sota_qemux86-64.bbclass
@@ -1,6 +1,8 @@
 # See https://advancedtelematic.atlassian.net/browse/PRO-2693
 PREFERRED_VERSION_linux-yocto_qemux86-64_sota = "4.4%"
 
+IMAGE_FSTYPES_remove = "wic"
+
 # U-Boot support for SOTA
 PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota"
 UBOOT_MACHINE_sota = "qemu-x86_defconfig"
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass
index 1d23d1f..b6cf639 100644
--- a/classes/sota_raspberrypi.bbclass
+++ b/classes/sota_raspberrypi.bbclass
@@ -1,8 +1,7 @@
 IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}"
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
 
-### both rpi-sdimg and rpi-sdimg-ota broken
-IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz"
+IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg', '', d)}"
 
 KERNEL_IMAGETYPE_sota = "uImage"
 PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot"