From bb25b4540fbe15fbc638087e8e7b86939c65db85 Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Fri, 19 Jan 2018 17:02:27 +0100
Subject: Rename all instances of hsm-test and use latest aktualizr.

---
 recipes-sota/aktualizr/aktualizr-hsm-prov.bb      | 31 +++++++++++++++++++++++
 recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb | 31 -----------------------
 recipes-sota/aktualizr/aktualizr_git.bb           |  4 +--
 3 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 recipes-sota/aktualizr/aktualizr-hsm-prov.bb
 delete mode 100644 recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb

(limited to 'recipes-sota')

diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
new file mode 100644
index 0000000..944607c
--- /dev/null
+++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Aktualizr configuration with HSM support"
+DESCRIPTION = "Systemd service and configurations for Aktualizr, the SOTA Client application written in C++"
+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 softhsm softhsm-testtoken"
+
+SRC_URI = " \
+  file://LICENSE \
+  "
+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}
+}
+
+FILES_${PN} = " \
+                ${libdir}/sota/sota.toml \
+                "
+
+# vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb
deleted file mode 100644
index 1e893fa..0000000
--- a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Aktualizr configuration with HSM support"
-DESCRIPTION = "Systemd service and configurations for Aktualizr, the SOTA Client application written in C++"
-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 softhsm softhsm-testtoken"
-
-SRC_URI = " \
-  file://LICENSE \
-  "
-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_test.toml -o ${D}${libdir}/sota/sota.toml -p ${D}
-}
-
-FILES_${PN} = " \
-                ${libdir}/sota/sota.toml \
-                "
-
-# vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 3925922..67ec104 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -21,7 +21,7 @@ SRC_URI = " \
   file://aktualizr.service \
   file://aktualizr-serialcan.service \
   "
-SRCREV = "37fbf0dfd88d42d76301890818dc4e83b35d9fa4"
+SRCREV = "07d73645231681848bd943074498581e930d8582"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
@@ -58,7 +58,7 @@ do_install_append_class-native () {
     rm -f ${D}${bindir}/example-interface
     install -d ${D}${libdir}/sota
     install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml
-    install -m 0644 ${S}/config/sota_hsm_test.toml ${D}/${libdir}/sota/sota_hsm_test.toml
+    install -m 0644 ${S}/config/sota_hsm_prov.toml ${D}/${libdir}/sota/sota_hsm_prov.toml
     install -m 0644 ${S}/config/sota_implicit_prov.toml ${D}/${libdir}/sota/sota_implicit_prov.toml
 
     install -m 0755 ${B}/src/sota_tools/garage-sign-prefix/src/garage-sign/bin/* ${D}${bindir}
-- 
cgit v1.2.3-54-g00ecf