Merge pull request #296 from advancedtelematic/feat/backport-from-master

Feat/backport from master

4 files changed, 22 insertions, 8 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index dc14e4a..9e3bc6f 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -1,7 +1,5 @@
 # OSTree deployment
 
-inherit image
-
 do_image_ostree[depends] += "ostree-native:do_populate_sysroot \
                         openssl-native:do_populate_sysroot \
                         coreutils-native:do_populate_sysroot \
@@ -203,6 +201,12 @@ IMAGE_CMD_garagesign () {
 
         ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME})
 
+        # Use OSTree target hash as version if none was provided by the user
+        target_version=${ostree_target_hash}
+        if [ -n "${GARAGE_TARGET_VERSION}" ]; then
+            target_version=${GARAGE_TARGET_VERSION}
+        fi
+
         # Push may fail due to race condition when multiple build machines try to push simultaneously
         #   in which case targets.json should be pulled again and the whole procedure repeated
         push_success=0
@@ -213,9 +217,9 @@ IMAGE_CMD_garagesign () {
                                     --home-dir ${GARAGE_SIGN_REPO} \
                                     --name ${GARAGE_TARGET_NAME} \
                                     --format OSTREE \
-                                    --version ${ostree_target_hash} \
+                                    --version ${target_version} \
                                     --length 0 \
-                                    --url "https://example.com/" \
+                                    --url "${GARAGE_TARGET_URL}" \
                                     --sha256 ${ostree_target_hash} \
                                     --hardwareids ${MACHINE}
             garage-sign targets sign --repo tufrepo \
@@ -231,6 +235,7 @@ IMAGE_CMD_garagesign () {
                 bbwarn "Push to garage repository has failed, retrying"
             fi
         done
+        rm -rf ${GARAGE_SIGN_REPO}
 
         if [ "$push_success" -ne "1" ]; then
             bberror "Couldn't push to garage repository"
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 36e7059..17fe4e8 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -7,8 +7,6 @@
 # boot scripts, kernel and initramfs images
 #
 
-inherit image
-
 OSTREE_BOOTLOADER ??= 'u-boot'
 
 do_image_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index bbb9ac9..1e765f0 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -31,10 +31,11 @@ OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
 GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo"
 GARAGE_SIGN_KEYNAME ?= "garage-key"
 GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}"
+GARAGE_TARGET_VERSION ?= ""
+GARAGE_TARGET_URL ?= "https://example.com/"
 
 SOTA_MACHINE ??="none"
-SOTA_MACHINE_raspberrypi2 ?= "raspberrypi"
-SOTA_MACHINE_raspberrypi3 ?= "raspberrypi"
+SOTA_MACHINE_rpi ?= "raspberrypi"
 SOTA_MACHINE_porter ?= "porter"
 SOTA_MACHINE_m3ulcb = "m3ulcb"
 SOTA_MACHINE_intel-corei7-64 ?= "minnowboard"
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index c146268..95c36fa 100644..100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -56,6 +56,11 @@ do_install_append () {
     rm -fr ${D}${libdir}/systemd
     rm -f ${D}${libdir}/sota/sota.toml # Only needed for the Debian package
     install -m 0700 -d ${D}${libdir}/sota/conf.d
+    install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml
+    install -m 0644 ${S}/config/sota_autoprov_primary.toml ${D}/${libdir}/sota/sota_autoprov_primary.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 0644 ${S}/config/sota_implicit_prov_ca.toml ${D}/${libdir}/sota/sota_implicit_prov_ca.toml
     install -m 0644 ${S}/config/sota_secondary.toml ${D}/${libdir}/sota/sota_secondary.toml
     install -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/aktualizr-secondary.socket ${D}${systemd_unitdir}/system/aktualizr-secondary.socket
@@ -106,6 +111,11 @@ FILES_${PN}-host-tools = " \
                 ${bindir}/aktualizr_implicit_writer \
                 ${bindir}/garage-deploy \
                 ${bindir}/garage-push \
+                ${libdir}/sota/sota_autoprov.toml \
+                ${libdir}/sota/sota_autoprov_primary.toml \
+                ${libdir}/sota/sota_hsm_prov.toml \
+                ${libdir}/sota/sota_implicit_prov.toml \
+                ${libdir}/sota/sota_implicit_prov_ca.toml \
                 "
 
 FILES_${PN}-secondary = " \