From e26ead04a52938134e9d4a122ee4b51c36a6dd60 Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Thu, 10 Oct 2019 13:49:50 +0200
Subject: Example config for a virtual secondary.

Useful for updating an arbitrary file in /var.

Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
---
 recipes-sota/config/aktualizr-virtualsec.bb  | 27 +++++++++++++++++++++++++++
 recipes-sota/config/files/30-virtualsec.toml |  3 +++
 recipes-sota/config/files/virtualsec.json    | 14 ++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 recipes-sota/config/aktualizr-virtualsec.bb
 create mode 100644 recipes-sota/config/files/30-virtualsec.toml
 create mode 100644 recipes-sota/config/files/virtualsec.json

diff --git a/recipes-sota/config/aktualizr-virtualsec.bb b/recipes-sota/config/aktualizr-virtualsec.bb
new file mode 100644
index 0000000..b7d55aa
--- /dev/null
+++ b/recipes-sota/config/aktualizr-virtualsec.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Example virtual secondary in aktualizr"
+DESCRIPTION = "Creates an example virtual secondary to be used to update an arbitrary file on the primary"
+HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
+SECTION = "base"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
+
+inherit allarch
+
+SRC_URI = " \
+            file://30-virtualsec.toml \
+            file://virtualsec.json \
+            "
+
+do_install_append () {
+    install -m 0700 -d ${D}${libdir}/sota/conf.d
+    install -m 0644 ${WORKDIR}/30-virtualsec.toml ${D}${libdir}/sota/conf.d/30-virtualsec.toml
+    install -m 0644 ${WORKDIR}/virtualsec.json ${D}${libdir}/sota/virtualsec.json
+}
+
+FILES_${PN} = " \
+                ${libdir}/sota/conf.d/30-virtualsec.toml \
+                ${libdir}/sota/virtualsec.json \
+                "
+
+# vim:set ts=4 sw=4 sts=4 expandtab:
+
diff --git a/recipes-sota/config/files/30-virtualsec.toml b/recipes-sota/config/files/30-virtualsec.toml
new file mode 100644
index 0000000..987f692
--- /dev/null
+++ b/recipes-sota/config/files/30-virtualsec.toml
@@ -0,0 +1,3 @@
+[uptane]
+secondary_config_file = "/usr/lib/sota/virtualsec.json"
+
diff --git a/recipes-sota/config/files/virtualsec.json b/recipes-sota/config/files/virtualsec.json
new file mode 100644
index 0000000..dcdcdba
--- /dev/null
+++ b/recipes-sota/config/files/virtualsec.json
@@ -0,0 +1,14 @@
+{
+    "virtual": [
+        {
+            "partial_verifying": "false",
+            "ecu_hardware_id": "external-config",
+            "full_client_dir": "/var/sota/external-config",
+            "ecu_private_key": "sec.private",
+            "ecu_public_key": "sec.public",
+            "firmware_path": "/var/sota/external-config/config.txt",
+            "target_name_path": "/var/sota/external-config/target_name",
+            "metadata_path": "/var/sota/external-config/metadata"
+        }
+    ]
+}
-- 
cgit v1.2.3-54-g00ecf


From 57d34ea124a1d7bc6d37492b5e3c33c6fd3a7bef Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Thu, 10 Oct 2019 13:55:33 +0200
Subject: Bump aktualizr to the latest
 (d13ff1ceeca2694b982287740aca8f58edad514d).

Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
---
 recipes-sota/aktualizr/aktualizr_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 694e849..e4c9be8 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -31,7 +31,7 @@ SRC_URI = " \
 SRC_URI[md5sum] = "66ffe8dcd61d4c15646e1c4b7dde7401"
 SRC_URI[sha256sum] = "7a7193ddf7e1a33ea60fbb20f98318a8bd78c325dab391d8c4ebd644a738abdc"
 
-SRCREV = "5443f810d63eedc92ff917e49ca20e2e7551ba43"
+SRCREV = "d13ff1ceeca2694b982287740aca8f58edad514d"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
-- 
cgit v1.2.3-54-g00ecf


From f87628186bd3b548c1f449adce3116d38557df5c Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Fri, 11 Oct 2019 14:23:51 +0200
Subject: Fix CI error if repos are missing after previous runs.

Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
---
 scripts/ci/checkout-oe.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/checkout-oe.sh b/scripts/ci/checkout-oe.sh
index fdc0e48..e8a2473 100755
--- a/scripts/ci/checkout-oe.sh
+++ b/scripts/ci/checkout-oe.sh
@@ -64,7 +64,9 @@ fi
 
 repo manifest
 
-repo forall -c 'git reset --hard ; git clean -fdx'
+# Try to clean up the repos in case they are messed up, but this returns an
+# error code if the repos don't exist, which the subsequent repo sync will fix.
+repo forall -c 'git reset --hard ; git clean -fdx' || true
 
 repo sync -d --force-sync
 
-- 
cgit v1.2.3-54-g00ecf