From dc234532add69842295902d35981dba886468da0 Mon Sep 17 00:00:00 2001
From: Phil Wise <phil@advancedtelematic.com>
Date: Mon, 26 Jun 2017 15:13:44 +0200
Subject: Aktualizr updates, including sync()

Perform sync() after provisioning
Store sota.toml in updatable /usr directory
---
 classes/image_types_ostree.bbclass                           | 2 +-
 recipes-sota/aktualizr/aktualizr_git.bb                      | 9 +++++----
 recipes-sota/aktualizr/files/aktualizr-autoprovision.service | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 2a74e51..72d7df5 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -203,7 +203,7 @@ IMAGE_CMD_ostree () {
 IMAGE_TYPEDEP_ostreepush = "ostree"
 IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot"
 IMAGE_CMD_ostreepush () {
-	if [ ${OSTREE_PUSH_CREDENTIALS} ]; then
+	if [ -n "${OSTREE_PUSH_CREDENTIALS}" ]; then
 		garage-push --repo=${OSTREE_REPO} \
 			    --ref=${OSTREE_BRANCHNAME} \
 			    --credentials=${OSTREE_PUSH_CREDENTIALS} \
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 62ee9b0..39a8ac8 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -12,7 +12,7 @@ SRC_URI = " \
   file://aktualizr-autoprovision.service \
   file://sota_autoprov.toml \
   "
-SRCREV = "2e897310c611e2da46f8af888bb62c09b2a2906a"
+SRCREV = "33614fb9fc8f6c9ab5fae20c16d1dca0a330b07f"
 PV = "1.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
@@ -23,13 +23,14 @@ inherit cmake systemd
 EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON -DAKTUALIZR_VERSION=${PV}"
 
 export SOTA_AUTOPROVISION_CREDENTIALS
+export SOTA_PACKED_CREDENTIALS
 
 do_install_append() {
     if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" -o -n "${SOTA_PACKED_CREDENTIALS}" ]; then
       install -d ${D}/${systemd_unitdir}/system
       install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service
-      install -d ${D}/var/sota
-      install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}/var/sota/sota.toml
+      install -d ${D}/usr/lib/sota
+      install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}/usr/lib/sota/sota.toml
     else
       install -d ${D}/${systemd_unitdir}/system
       install -m 0644 ${WORKDIR}/aktualizr-manual-provision.service ${D}/${systemd_unitdir}/system/aktualizr.service
@@ -39,5 +40,5 @@ do_install_append() {
 FILES_${PN} = " \
                 ${bindir}/aktualizr \
                 ${systemd_unitdir}/system/aktualizr.service \
-		/var/sota/sota.toml \
+                /usr/lib/sota/sota.toml \
                 "
diff --git a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
index a5b92e3..fd0ab09 100644
--- a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
+++ b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
@@ -8,7 +8,7 @@ Requires=network-online.target
 RestartSec=10
 Restart=always
 EnvironmentFile=/var/sota/sota_provisioning_url.env
-ExecStart=/bin/sh -c "/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --primary-ecu-hardware-id `cat /etc/hostname`  --config /var/sota/sota.toml"
+ExecStart=/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --config /usr/lib/sota/sota.toml
 
 [Install]
 WantedBy=multi-user.target
-- 
cgit v1.2.3-54-g00ecf