image_types_ota: use named reference

Use named reference when deploying the device tree. This makes sure that
this reference will end up in the deployments .origin file, which will
be visible by the user in ostree admin status. This reference will also
be used when running ostree admin upgrade. This is not really required
when using aktualizr, but can be useful during test/debugging when using
pure OSTree updates. Make sure to make ${OSTREE_REPO} accessible via
http and add a remote on the device called ${OSTREE_OSNAME} pointing to
the http exposed archive OSTree. With that ostree admin upgrade should
work.

Note: We could use the name reference in ostree pull-local already, but
this is potentially racy if multiple builds are committing to the same
branch. Use the OSTree commit hash to get the actual commit and recreate
a local reference to this commit. This makes absolutely sure that we use
the same OSTree commit this bitbake execution committed during the
do_image_ostreecommit task.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 56c7794..a8a19b5 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -66,13 +66,23 @@ IMAGE_CMD_ota () {
 
         ostree_target_hash=$(cat ${WORKDIR}/ostree_manifest)
 
+        # Use OSTree hash to avoid any potential race conditions between
+        # multiple builds accessing the same ${OSTREE_REPO}.
         ostree --repo=${OTA_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${ostree_target_hash}
         kargs_list=""
         for arg in ${OSTREE_KERNEL_ARGS}; do
                 kargs_list="${kargs_list} --karg-append=$arg"
         done
 
-        ostree admin --sysroot=${OTA_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${ostree_target_hash}
+        # Create the same reference on the device we use in the archive OSTree
+        # repo in ${OSTREE_REPO}. This reference will show up when showing the
+        # deployment on the device:
+        # ostree admin status
+        # If a remote with the name ${OSTREE_OSNAME} is configured, this also
+        # will allow to use:
+        # ostree admin upgrade
+        ostree --repo=${OTA_SYSROOT}/ostree/repo refs --create=${OSTREE_OSNAME}:${OSTREE_BRANCHNAME} ${ostree_target_hash}
+        ostree admin --sysroot=${OTA_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME}
 
         cp -a ${IMAGE_ROOTFS}/var/sota ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
         # Create /var/sota if it doesn't exist yet