Rename provisioning methods.

"Autoprovisioning" or "automatic provisioning" is now known as "shared
credential provisioning". "Implicit provisioning" is now known as
"device credential provisioning". "HSM provisioning" was always a
misnomer, so it is now refered to as "device credential provisioning
with an HSM".

This includes a bump of the aktualizr version as well.

Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>

7 files changed, 19 insertions, 19 deletions

diff --git a/recipes-test/demo-config/files/30-fake_pacman.toml b/recipes-test/demo-config/files/30-fake-pacman.toml
index 3fb5cf2..3fb5cf2 100644
--- a/recipes-test/demo-config/files/30-fake_pacman.toml
+++ b/recipes-test/demo-config/files/30-fake-pacman.toml
diff --git a/recipes-test/demo-config/files/30-secondary_config.toml b/recipes-test/demo-config/files/30-secondary-config.toml
index 7714240..7714240 100644
--- a/recipes-test/demo-config/files/30-secondary_config.toml
+++ b/recipes-test/demo-config/files/30-secondary-config.toml
diff --git a/recipes-test/demo-config/files/35-network_config.toml b/recipes-test/demo-config/files/35-network-config.toml
index db7a1bb..db7a1bb 100644
--- a/recipes-test/demo-config/files/35-network_config.toml
+++ b/recipes-test/demo-config/files/35-network-config.toml
diff --git a/recipes-test/demo-config/files/45-id_config.toml b/recipes-test/demo-config/files/45-id-config.toml
index 6cbd77f..6cbd77f 100644
--- a/recipes-test/demo-config/files/45-id_config.toml
+++ b/recipes-test/demo-config/files/45-id-config.toml
diff --git a/recipes-test/demo-config/primary-config.bb b/recipes-test/demo-config/primary-config.bb
index 0cd9180..27cb553 100644
--- a/recipes-test/demo-config/primary-config.bb
+++ b/recipes-test/demo-config/primary-config.bb
@@ -7,7 +7,7 @@ require shared-conf.inc
 PRIMARY_SECONDARIES ?= "${SECONDARY_IP}:${SECONDARY_PORT}"
 
 SRC_URI = "\
-    file://30-secondary_config.toml \
+    file://30-secondary-config.toml \
     file://ip_secondary_config.json \
     "
 
@@ -56,8 +56,8 @@ do_install () {
 
     # install aktualizr config file (toml) that points to the secondary config file, so aktualizr is aware about it
     install -m 0700 -d ${D}${libdir}/sota/conf.d
-    install -m 0644 ${WORKDIR}/30-secondary_config.toml ${D}${libdir}/sota/conf.d
-    sed -i "s|@CFG_FILEPATH@|$SECONDARY_CONFIG_FILEPATH_ON_IMAGE|g" ${D}${libdir}/sota/conf.d/30-secondary_config.toml
+    install -m 0644 ${WORKDIR}/30-secondary-config.toml ${D}${libdir}/sota/conf.d
+    sed -i "s|@CFG_FILEPATH@|$SECONDARY_CONFIG_FILEPATH_ON_IMAGE|g" ${D}${libdir}/sota/conf.d/30-secondary-config.toml
 }
 
 FILES_${PN} = " \
diff --git a/recipes-test/demo-config/secondary-config.bb b/recipes-test/demo-config/secondary-config.bb
index 5b213d1..9411646 100644
--- a/recipes-test/demo-config/secondary-config.bb
+++ b/recipes-test/demo-config/secondary-config.bb
@@ -9,33 +9,33 @@ SOTA_HARDWARE_ID ?= "${MACHINE}-sndry"
 SECONDARY_HARDWARE_ID ?= "${SOTA_HARDWARE_ID}"
 
 SRC_URI = "\
-    file://30-fake_pacman.toml \
-    file://35-network_config.toml \
-    file://45-id_config.toml \
+    file://30-fake-pacman.toml \
+    file://35-network-config.toml \
+    file://45-id-config.toml \
     "
 
 do_install () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
-    install -m 0644 ${WORKDIR}/30-fake_pacman.toml ${D}/${libdir}/sota/conf.d/30-fake_pacman.toml
+    install -m 0644 ${WORKDIR}/30-fake-pacman.toml ${D}/${libdir}/sota/conf.d/30-fake-pacman.toml
 
-    install -m 0644 ${WORKDIR}/35-network_config.toml ${D}/${libdir}/sota/conf.d/35-network_config.toml
+    install -m 0644 ${WORKDIR}/35-network-config.toml ${D}/${libdir}/sota/conf.d/35-network-config.toml
     sed -i -e 's|@PORT@|${SECONDARY_PORT}|g' \
            -e 's|@PRIMARY_IP@|${PRIMARY_IP}|g' \
            -e 's|@PRIMARY_PORT@|${PRIMARY_PORT}|g' \
-           ${D}/${libdir}/sota/conf.d/35-network_config.toml
+           ${D}/${libdir}/sota/conf.d/35-network-config.toml
 
-    install -m 0644 ${WORKDIR}/45-id_config.toml ${D}/${libdir}/sota/conf.d/45-id_config.toml
+    install -m 0644 ${WORKDIR}/45-id-config.toml ${D}/${libdir}/sota/conf.d/45-id-config.toml
     sed -i -e 's|@SERIAL@|${SECONDARY_SERIAL_ID}|g' \
            -e 's|@HWID@|${SECONDARY_HARDWARE_ID}|g' \
-           ${D}/${libdir}/sota/conf.d/45-id_config.toml
+           ${D}/${libdir}/sota/conf.d/45-id-config.toml
 
 }
 
 FILES_${PN} = " \
                 ${libdir}/sota/conf.d \
-                ${libdir}/sota/conf.d/30-fake_pacman.toml \
-                ${libdir}/sota/conf.d/35-network_config.toml \
-                ${libdir}/sota/conf.d/45-id_config.toml \
+                ${libdir}/sota/conf.d/30-fake-pacman.toml \
+                ${libdir}/sota/conf.d/35-network-config.toml \
+                ${libdir}/sota/conf.d/45-id-config.toml \
                 "
 
 # vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-test/images/secondary-image.bb b/recipes-test/images/secondary-image.bb
index 4cae874..27d1e3f 100644
--- a/recipes-test/images/secondary-image.bb
+++ b/recipes-test/images/secondary-image.bb
@@ -11,11 +11,11 @@ SOTA_HARDWARE_ID ?= "${MACHINE}-sndry"
 # RDEPENDS on aktualizr)
 IMAGE_INSTALL_remove = " \
                         aktualizr \
-                        aktualizr-auto-prov \
-                        aktualizr-auto-prov-creds \
-                        aktualizr-ca-implicit-prov \
-                        aktualizr-ca-implicit-prov-creds \
-                        aktualizr-hsm-prov \
+                        aktualizr-shared-prov \
+                        aktualizr-shared-prov-creds \
+                        aktualizr-device-prov \
+                        aktualizr-device-prov-creds \
+                        aktualizr-device-prov-hsm \
                         aktualizr-uboot-env-rollback \
                         virtual/network-configuration \
                         "