From 4d1b5eef40ec0c9587bbb99e24f75e36f4c77df7 Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Tue, 30 Jan 2018 12:07:41 +0100
Subject: Delete redundant sota.toml in aktualizr recipe.

It's installed for the Ubuntu case but is not necessary in meta-updater.
---
 recipes-sota/aktualizr/aktualizr_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 495162e..beaf893 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -42,6 +42,7 @@ do_install_append () {
 }
 do_install_append_class-target () {
     rm -f ${D}${bindir}/aktualizr_implicit_writer
+    rm -f ${D}${libdir}/sota/sota.toml
     ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', '', 'rm -f ${D}${bindir}/example-interface', d)}
     ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-isotp-example', '', 'rm -f ${D}${bindir}/isotp-test-interface', d)}
 
-- 
cgit v1.2.3-54-g00ecf


From 5f033dd60d20ce332d3f1d8d44e296791660d6d3 Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Tue, 30 Jan 2018 12:08:56 +0100
Subject: Minor changes to keep hsm and implicit recipes consistent.

At present they should be very similar. The only outstanding difference
(other than the HSM parts) is whether the root CA is installed.
---
 recipes-sota/aktualizr/aktualizr-hsm-prov.bb      | 9 +++++----
 recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
index 944607c..5f8da3c 100644
--- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Aktualizr configuration with HSM support"
-DESCRIPTION = "Systemd service and configurations for Aktualizr, the SOTA Client application written in C++"
+DESCRIPTION = "Systemd service and configurations for HSM provisioning with Aktualizr, the SOTA Client application written in C++"
 HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
 SECTION = "base"
 LICENSE = "MPL-2.0"
@@ -14,14 +14,15 @@ SRC_URI = " \
 PV = "1.0"
 PR = "6"
 
-
 require environment.inc
 require credentials.inc
 
 do_install() {
     install -d ${D}${libdir}/sota
-    aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \
-        -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D}
+    if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
+        aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \
+            -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D}
+    fi
 }
 
 FILES_${PN} = " \
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
index b5bf420..cf3d22c 100644
--- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
@@ -4,15 +4,15 @@ HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
 SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
+
 DEPENDS = "aktualizr-native"
 RDEPENDS_${PN} = "aktualizr"
-PV = "1.0"
-PR = "1"
 
 SRC_URI = " \
   file://LICENSE \
   "
-
+PV = "1.0"
+PR = "1"
 
 require environment.inc
 require credentials.inc
-- 
cgit v1.2.3-54-g00ecf