Merge pull request #133 from advancedtelematic/merge-morty-changes-forward

Merge morty changes forward to pyro

13 files changed, 265 insertions, 226 deletions

diff --git a/README.adoc b/README.adoc
index d625780..9615f65 100644
--- a/README.adoc
+++ b/README.adoc
@@ -115,7 +115,7 @@ ostree admin deploy --os=agl agl-snapshot:agl-ota
 
 === SOTA tools
 
-SOTA tools now contains only one tool, garage-push that lets you push the changes in OSTree repository generated by bitbake process. It communicates with an http server capable of querying files with HEAD requests and uploading them with POST requests. In particular, this can be used with http://www.atsgarage.com/[ATS Garage]. garage-push is used as follws:
+SOTA tools currently contains only one tool, garage-push, which lets you push the changes in OSTree repository generated by bitbake process. It communicates with an http server capable of querying files with HEAD requests and uploading them with POST requests. In particular, this can be used with http://www.atsgarage.com/[ATS Garage]. garage-push is used as follows:
 
 ....
 garage-push --repo=/path/to/ostree-repo --ref=mybranch --credentials=/path/to/credentials.json
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index a62ec84..110f88d 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -4,6 +4,7 @@ inherit image
 
 IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ 
                         openssl-native:do_populate_sysroot \
+                        zip-native:do_populate_sysroot \
                         virtual/kernel:do_deploy \
                         ${OSTREE_INITRAMFS_IMAGE}:do_image_complete \
                         unzip-native"
@@ -18,36 +19,6 @@ OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
 
 export SYSTEMD_USED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', '', d)}"
 
-python () {
-    if d.getVar("SOTA_PACKED_CREDENTIALS", True):
-        if d.getVar("SOTA_AUTOPROVISION_CREDENTIALS", True):
-            bb.warn("SOTA_AUTOPROVISION_CREDENTIALS are overriden by those in SOTA_PACKED_CREDENTIALS")
-        if d.getVar("SOTA_AUTOPROVISION_URL", True):
-            bb.warn("SOTA_AUTOPROVISION_URL is overriden by the one in SOTA_PACKED_CREDENTIALS")
-
-        if d.getVar("SOTA_AUTOPROVISION_URL_FILE", True):
-            bb.warn("SOTA_AUTOPROVISION_URL_FILE is overriden by the one in SOTA_PACKED_CREDENTIALS")
-
-        if d.getVar("OSTREE_PUSH_CREDENTIALS", True):
-            bb.warn("OSTREE_PUSH_CREDENTIALS are overriden by those in SOTA_PACKED_CREDENTIALS")
-
-        d.setVar("SOTA_AUTOPROVISION_CREDENTIALS", "%s/sota_credentials/autoprov_credentials.p12" % d.getVar("DEPLOY_DIR_IMAGE", True))
-        d.setVar("SOTA_AUTOPROVISION_URL_FILE", "%s/sota_credentials/autoprov.url" % d.getVar("DEPLOY_DIR_IMAGE", True))
-        d.setVar("OSTREE_PUSH_CREDENTIALS", "%s/sota_credentials/treehub.json" % d.getVar("DEPLOY_DIR_IMAGE", True))
-}
-
-IMAGE_DEPENDS_ostreecredunpack = "unzip-native:do_populate_sysroot"
-
-IMAGE_CMD_ostreecredunpack () {
-        if [ ${SOTA_PACKED_CREDENTIALS} ]; then
-                rm -rf ${DEPLOY_DIR_IMAGE}/sota_credentials
-
-                unzip ${SOTA_PACKED_CREDENTIALS} -d ${DEPLOY_DIR_IMAGE}/sota_credentials
-        fi
-}
-
-IMAGE_TYPEDEP_ostree = "ostreecredunpack"
-
 IMAGE_CMD_ostree () {
         if [ -z "$OSTREE_REPO" ]; then
                 bbfatal "OSTREE_REPO should be set in your local.conf"
@@ -146,22 +117,33 @@ IMAGE_CMD_ostree () {
                 ln -sf var/roothome root
         fi
 
-        # deploy SOTA credentials
-        if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" ]; then
-                EXPDATE=`openssl pkcs12 -in ${SOTA_AUTOPROVISION_CREDENTIALS} -password "pass:" -nodes 2>/dev/null | openssl x509 -noout -enddate | cut -f2 -d "="`
+        mkdir -p var/sota
 
-                if [ `date +%s` -ge `date -d "${EXPDATE}" +%s` ]; then
-                        bberror "Certificate ${SOTA_AUTOPROVISION_CREDENTIALS} has expired on ${EXPDATE}"
-                fi
+        if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" ]; then
+        bbwarn "SOTA_AUTOPROVISION_CREDENTIALS are ignored. Please use SOTA_PACKED_CREDENTIALS"
+    fi
+        if [ -n "${SOTA_AUTOPROVISION_URL}" ]; then
+        bbwarn "SOTA_AUTOPROVISION_URL is ignored. Please use SOTA_PACKED_CREDENTIALS"
+    fi
+        if [ -n "${SOTA_AUTOPROVISION_URL_FILE}" ]; then
+        bbwarn "SOTA_AUTOPROVISION_URL_FILE is ignored. Please use SOTA_PACKED_CREDENTIALS"
+    fi
+        if [ -n "${OSTREE_PUSH_CREDENTIALS}" ]; then
+        bbwarn "OSTREE_PUSH_CREDENTIALS is ignored. Please use SOTA_PACKED_CREDENTIALS"
+    fi
 
-                mkdir -p var/sota
-                cp ${SOTA_AUTOPROVISION_CREDENTIALS} var/sota/sota_provisioning_credentials.p12
-                if [ -n "${SOTA_AUTOPROVISION_URL_FILE}" ]; then
-                        export SOTA_AUTOPROVISION_URL=`cat ${SOTA_AUTOPROVISION_URL_FILE}`
-                fi
-                echo "SOTA_GATEWAY_URI=${SOTA_AUTOPROVISION_URL}" > var/sota/sota_provisioning_url.env
+        # deploy SOTA credentials
+        if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
+                if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then
+                        cp ${SOTA_PACKED_CREDENTIALS} var/sota/sota_provisioning_credentials.zip
+                        # Device should not be able to push data to treehub
+                        zip -d var/sota/sota_provisioning_credentials.zip treehub.json
+                fi
         fi
 
+        if [ -n "${SOTA_SECONDARY_ECUS}" ]; then
+                cp ${SOTA_SECONDARY_ECUS} var/sota/ecus
+        fi
 
         # Creating boot directories is required for "ostree admin deploy"
 
@@ -204,10 +186,17 @@ IMAGE_CMD_ostree () {
 IMAGE_TYPEDEP_ostreepush = "ostree"
 IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot"
 IMAGE_CMD_ostreepush () {
-        if [ -n "${OSTREE_PUSH_CREDENTIALS}" ]; then
-                garage-push --repo=${OSTREE_REPO} \
-                            --ref=${OSTREE_BRANCHNAME} \
-                            --credentials=${OSTREE_PUSH_CREDENTIALS} \
-                            --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt
+        # Print warnings if credetials are not set or if the file has not been found.
+        if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
+                if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then
+                        garage-push --repo=${OSTREE_REPO} \
+                                    --ref=${OSTREE_BRANCHNAME} \
+                                    --credentials=${SOTA_PACKED_CREDENTIALS} \
+                                    --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt
+                else
+                        bbwarn "SOTA_PACKED_CREDENTIALS file does not exist."
+                fi
+        else
+                bbwarn "SOTA_PACKED_CREDENTIALS not set. Please add SOTA_PACKED_CREDENTIALS."
         fi
 }
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 359c9fb..8bc580d 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -13,8 +13,9 @@ SRC_URI = " \
   file://aktualizr-autoprovision.service \
   file://sota_autoprov.toml \
   "
-SRCREV = "c24f1fc9b600113cf9f2d3d7215e406cbbb70ac4"
+SRCREV = "1004efa3f86cef90c012b34620992b5762b741e3"
 PV = "1.0+git${SRCPV}"
+PR = "6"
 
 S = "${WORKDIR}/git"
 SYSTEMD_SERVICE_${PN} = "aktualizr.service"
@@ -23,11 +24,10 @@ inherit cmake systemd
 
 EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON -DAKTUALIZR_VERSION=${PV}"
 
-export SOTA_AUTOPROVISION_CREDENTIALS
 export SOTA_PACKED_CREDENTIALS
 
 do_install_append() {
-    if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" -o -n "${SOTA_PACKED_CREDENTIALS}" ]; then
+    if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
       install -d ${D}/${systemd_unitdir}/system
       install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service
       install -d ${D}/usr/lib/sota
diff --git a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
index fd0ab09..4a595f0 100644
--- a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
+++ b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
@@ -7,8 +7,7 @@ Requires=network-online.target
 [Service]
 RestartSec=10
 Restart=always
-EnvironmentFile=/var/sota/sota_provisioning_url.env
-ExecStart=/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --config /usr/lib/sota/sota.toml
+ExecStart=/usr/bin/aktualizr --disable-keyid-validation --config /usr/lib/sota/sota.toml
 
 [Install]
 WantedBy=multi-user.target
diff --git a/recipes-sota/aktualizr/files/sota_autoprov.toml b/recipes-sota/aktualizr/files/sota_autoprov.toml
index 8799553..9fbb093 100644
--- a/recipes-sota/aktualizr/files/sota_autoprov.toml
+++ b/recipes-sota/aktualizr/files/sota_autoprov.toml
@@ -1,9 +1,5 @@
-[device]
-packages_dir = "/tmp/packages_dir"
-certificates_directory = "/var/sota"
-system_info = "system_info.sh"
-
 [tls]
+certificates_directory = "/var/sota/"
 ca_file = "root.crt"
 client_certificate = "client.pem"
 pkey_file = "pkey.pem"
@@ -14,5 +10,5 @@ private_key_path = "ecukey.der"
 public_key_path = "ecukey.pub"
 
 [provision]
-p12_path = "sota_provisioning_credentials.p12"
+provision_path = "/var/sota/sota_provisioning_credentials.zip"
 
diff --git a/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service b/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service
index 0431455..11b1354 100644
--- a/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service
+++ b/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service
@@ -6,7 +6,6 @@ After=network-online.target
 [Service]
 Type=oneshot
 WorkingDirectory=/var/sota
-EnvironmentFile=/var/sota/sota_provisioning_url.env
 Environment=SOTA_CERT_DIR=/var/sota
 ExecStart=/usr/bin/sota_provision.sh sota_provisioning_credentials
 RemainAfterExit=true
diff --git a/recipes-sota/rvi-sota-client/files/sota-installer.service b/recipes-sota/rvi-sota-client/files/sota-installer.service
new file mode 100644
index 0000000..a4fd99e
--- /dev/null
+++ b/recipes-sota/rvi-sota-client/files/sota-installer.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=SOTA Secondary ECU Installer
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+RestartSec=10
+Restart=always
+ExecStart=/usr/bin/sota-installer --level debug --oneshot --config /var/sota/installer.toml
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client.inc b/recipes-sota/rvi-sota-client/rvi-sota-client.inc
new file mode 100644
index 0000000..6718bab
--- /dev/null
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client.inc
@@ -0,0 +1,145 @@
+inherit cargo systemd
+
+DESCRIPTION = "rvi-sota-client recipe"
+HOMEPAGE = "https://github.com/advancedtelematic/rvi_sota_client"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea"
+
+BBCLASSEXTEND = "native"
+
+S = "${WORKDIR}/git"
+
+SRC_URI[index.md5sum] = "6a635e8a081b4d4ba4cebffd721c2d7d"
+SRC_URI[index.sha256sum] = "1913c41d4b8de89a931b6f9e418f83e70a083e12e6c247e8510ee932571ebae2"
+
+# also update PV and SRC_URI crates when updating SRCREV
+SRCREV = "d41540a54ee7bba20835b337f3a477d5f1386c76"
+
+PR = "1"
+
+# generate with: `make package-version`
+PV = "0.2.33-76-gd41540a"
+
+# generate with: `make yocto-version`
+SRC_URI = " \
+git://github.com/advancedtelematic/rvi_sota_client \
+file://sota-client-autoprovision.service \
+file://sota-client-ostree.service \
+file://sota-client-uptane.service \
+file://sota-installer.service \
+crate://crates.io/advapi32-sys/0.2.0 \
+crate://crates.io/aho-corasick/0.6.3 \
+crate://crates.io/ansi_term/0.9.0 \
+crate://crates.io/antidote/1.0.0 \
+crate://crates.io/atty/0.2.2 \
+crate://crates.io/backtrace/0.3.2 \
+crate://crates.io/backtrace-sys/0.1.11 \
+crate://crates.io/base64/0.5.2 \
+crate://crates.io/bit-set/0.4.0 \
+crate://crates.io/bit-vec/0.4.4 \
+crate://crates.io/bitflags/0.9.1 \
+crate://crates.io/byteorder/1.1.0 \
+crate://crates.io/bytes/0.4.4 \
+crate://crates.io/cfg-if/0.1.2 \
+crate://crates.io/chan/0.1.19 \
+crate://crates.io/chan-signal/0.2.0 \
+crate://crates.io/chrono/0.4.0 \
+crate://crates.io/clap/2.25.0 \
+crate://crates.io/core-foundation/0.2.3 \
+crate://crates.io/core-foundation-sys/0.2.3 \
+crate://crates.io/crossbeam/0.2.10 \
+crate://crates.io/crypt32-sys/0.2.0 \
+crate://crates.io/dbghelp-sys/0.2.0 \
+crate://crates.io/dbus/0.5.3 \
+crate://crates.io/dtoa/0.4.1 \
+crate://crates.io/env_logger/0.4.3 \
+crate://crates.io/error-chain/0.10.0 \
+crate://crates.io/filetime/0.1.10 \
+crate://crates.io/foreign-types/0.2.0 \
+crate://crates.io/gcc/0.3.51 \
+crate://crates.io/getopts/0.2.14 \
+crate://crates.io/hex/0.2.0 \
+crate://crates.io/httparse/1.2.3 \
+crate://crates.io/hyper/0.10.12 \
+crate://crates.io/hyper-native-tls/0.2.4 \
+crate://crates.io/idna/0.1.4 \
+crate://crates.io/iovec/0.1.0 \
+crate://crates.io/itoa/0.3.1 \
+crate://crates.io/kernel32-sys/0.2.2 \
+crate://crates.io/language-tags/0.2.2 \
+crate://crates.io/lazy_static/0.2.8 \
+crate://crates.io/libc/0.2.26 \
+crate://crates.io/libflate/0.1.5 \
+crate://crates.io/log/0.3.8 \
+crate://crates.io/maplit/0.1.4 \
+crate://crates.io/matches/0.1.6 \
+crate://crates.io/memchr/1.0.1 \
+crate://crates.io/metadeps/1.1.2 \
+crate://crates.io/mime/0.2.6 \
+crate://crates.io/native-tls/0.1.4 \
+crate://crates.io/net2/0.2.29 \
+crate://crates.io/num/0.1.40 \
+crate://crates.io/num-integer/0.1.35 \
+crate://crates.io/num-iter/0.1.34 \
+crate://crates.io/num-traits/0.1.40 \
+crate://crates.io/num_cpus/1.6.2 \
+crate://crates.io/openssl/0.9.14 \
+crate://crates.io/openssl-sys/0.9.14 \
+crate://crates.io/pem/0.4.0 \
+crate://crates.io/percent-encoding/1.0.0 \
+crate://crates.io/pkg-config/0.3.9 \
+crate://crates.io/quote/0.3.15 \
+crate://crates.io/rand/0.3.15 \
+crate://crates.io/redox_syscall/0.1.26 \
+crate://crates.io/regex/0.2.2 \
+crate://crates.io/regex-syntax/0.4.1 \
+crate://crates.io/reqwest/0.6.2 \
+crate://crates.io/ring/0.7.1 \
+crate://crates.io/rust-crypto/0.2.36 \
+crate://crates.io/rustc-demangle/0.1.4 \
+crate://crates.io/rustc-serialize/0.3.24 \
+crate://crates.io/schannel/0.1.7 \
+crate://crates.io/secur32-sys/0.2.0 \
+crate://crates.io/security-framework/0.1.14 \
+crate://crates.io/security-framework-sys/0.1.14 \
+crate://crates.io/serde/1.0.10 \
+crate://crates.io/serde_derive/1.0.10 \
+crate://crates.io/serde_derive_internals/0.15.1 \
+crate://crates.io/serde_json/1.0.2 \
+crate://crates.io/serde_urlencoded/0.5.1 \
+crate://crates.io/sha1/0.2.0 \
+crate://crates.io/strsim/0.6.0 \
+crate://crates.io/syn/0.11.11 \
+crate://crates.io/synom/0.11.3 \
+crate://crates.io/tar/0.4.13 \
+crate://crates.io/tempdir/0.3.5 \
+crate://crates.io/term_size/0.3.0 \
+crate://crates.io/textwrap/0.6.0 \
+crate://crates.io/thread_local/0.3.4 \
+crate://crates.io/time/0.1.38 \
+crate://crates.io/toml/0.2.1 \
+crate://crates.io/toml/0.4.2 \
+crate://crates.io/traitobject/0.1.0 \
+crate://crates.io/tungstenite/0.2.4 \
+crate://crates.io/typeable/0.1.2 \
+crate://crates.io/unicase/1.4.2 \
+crate://crates.io/unicode-bidi/0.3.3 \
+crate://crates.io/unicode-normalization/0.1.5 \
+crate://crates.io/unicode-segmentation/1.1.0 \
+crate://crates.io/unicode-width/0.1.4 \
+crate://crates.io/unicode-xid/0.0.4 \
+crate://crates.io/unix_socket/0.5.0 \
+crate://crates.io/unreachable/1.0.0 \
+crate://crates.io/untrusted/0.3.2 \
+crate://crates.io/url/1.5.1 \
+crate://crates.io/utf-8/0.7.1 \
+crate://crates.io/utf8-ranges/1.0.0 \
+crate://crates.io/uuid/0.5.1 \
+crate://crates.io/vec_map/0.8.0 \
+crate://crates.io/version_check/0.1.3 \
+crate://crates.io/void/1.0.2 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/ws2_32-sys/0.2.1 \
+crate://crates.io/xattr/0.1.11 \
+"
diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
index 753488a..e286598 100644
--- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
@@ -1,25 +1,7 @@
-DESCRIPTION = "sota-client rust recipe"
-HOMEPAGE = "https://github.com/advancedtelematic/rvi_sota_client"
+require rvi-sota-client.inc
 
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea"
 
-inherit cargo systemd
-
-S = "${WORKDIR}/git"
-
-# When changing this, don't forget to:
-# 1) Update PV
-# 2) Check that Cargo.lock hasn't changed with git diff old..new Cargo.lock
-SRCREV = "b6cf6957203fc406b3723d046f1b705e1bd08d7d"
-
-# Generate with:
-#   git describe --tags | cut -b2-
-# or from the rvi_sota_client repo:
-#   make package-version
-PV = "0.2.33-41-gb6cf695"
-
-BBCLASSEXTEND = "native"
+SYSTEMD_SERVICE_${PN} = "sota-client.service sota-client-autoprovision.service"
 
 FILES_${PN} = " \
 /lib64 \
@@ -32,151 +14,20 @@ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/so
 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota-client-autoprovision.service', '', d)} \
 "
 
-
-# list of dependencies can be generated from Cargo.lock by running
-#   cat Cargo.lock | sed -e '1,/metadata/ d' Cargo.lock | awk '{print "crate://crates.io/"$2 "/" $3" \\"}'
-SRC_URI = " \
-crate://crates.io/advapi32-sys/0.2.0 \
-crate://crates.io/aho-corasick/0.6.3 \
-crate://crates.io/ansi_term/0.9.0 \
-crate://crates.io/antidote/1.0.0 \
-crate://crates.io/atty/0.2.2 \
-crate://crates.io/backtrace/0.3.2 \
-crate://crates.io/backtrace-sys/0.1.11 \
-crate://crates.io/base64/0.5.2 \
-crate://crates.io/bit-set/0.4.0 \
-crate://crates.io/bit-vec/0.4.4 \
-crate://crates.io/bitflags/0.9.1 \
-crate://crates.io/byteorder/1.0.0 \
-crate://crates.io/bytes/0.4.4 \
-crate://crates.io/cfg-if/0.1.2 \
-crate://crates.io/chan/0.1.19 \
-crate://crates.io/chan-signal/0.2.0 \
-crate://crates.io/chrono/0.4.0 \
-crate://crates.io/clap/2.25.0 \
-crate://crates.io/core-foundation/0.2.3 \
-crate://crates.io/core-foundation-sys/0.2.3 \
-crate://crates.io/crossbeam/0.2.10 \
-crate://crates.io/crypt32-sys/0.2.0 \
-crate://crates.io/dbghelp-sys/0.2.0 \
-crate://crates.io/dbus/0.5.3 \
-crate://crates.io/dtoa/0.4.1 \
-crate://crates.io/env_logger/0.4.3 \
-crate://crates.io/error-chain/0.10.0 \
-crate://crates.io/filetime/0.1.10 \
-crate://crates.io/foreign-types/0.2.0 \
-crate://crates.io/gcc/0.3.51 \
-crate://crates.io/getopts/0.2.14 \
-crate://crates.io/hex/0.2.0 \
-crate://crates.io/httparse/1.2.3 \
-crate://crates.io/hyper/0.10.12 \
-crate://crates.io/hyper-native-tls/0.2.4 \
-crate://crates.io/idna/0.1.2 \
-crate://crates.io/iovec/0.1.0 \
-crate://crates.io/itoa/0.3.1 \
-crate://crates.io/kernel32-sys/0.2.2 \
-crate://crates.io/language-tags/0.2.2 \
-crate://crates.io/lazy_static/0.2.8 \
-crate://crates.io/libc/0.2.24 \
-crate://crates.io/libflate/0.1.9 \
-crate://crates.io/log/0.3.8 \
-crate://crates.io/maplit/0.1.4 \
-crate://crates.io/matches/0.1.6 \
-crate://crates.io/memchr/1.0.1 \
-crate://crates.io/metadeps/1.1.2 \
-crate://crates.io/mime/0.2.6 \
-crate://crates.io/native-tls/0.1.4 \
-crate://crates.io/net2/0.2.29 \
-crate://crates.io/num/0.1.39 \
-crate://crates.io/num-integer/0.1.34 \
-crate://crates.io/num-iter/0.1.33 \
-crate://crates.io/num-traits/0.1.39 \
-crate://crates.io/num_cpus/1.6.2 \
-crate://crates.io/openssl/0.9.14 \
-crate://crates.io/openssl-sys/0.9.14 \
-crate://crates.io/pem/0.4.0 \
-crate://crates.io/percent-encoding/1.0.0 \
-crate://crates.io/pkg-config/0.3.9 \
-crate://crates.io/quote/0.3.15 \
-crate://crates.io/rand/0.3.15 \
-crate://crates.io/redox_syscall/0.1.21 \
-crate://crates.io/regex/0.2.2 \
-crate://crates.io/regex-syntax/0.4.1 \
-crate://crates.io/reqwest/0.6.2 \
-crate://crates.io/ring/0.7.1 \
-crate://crates.io/rust-crypto/0.2.36 \
-crate://crates.io/rustc-demangle/0.1.4 \
-crate://crates.io/rustc-serialize/0.3.24 \
-crate://crates.io/schannel/0.1.7 \
-crate://crates.io/secur32-sys/0.2.0 \
-crate://crates.io/security-framework/0.1.14 \
-crate://crates.io/security-framework-sys/0.1.14 \
-crate://crates.io/serde/1.0.9 \
-crate://crates.io/serde_derive/1.0.9 \
-crate://crates.io/serde_derive_internals/0.15.1 \
-crate://crates.io/serde_json/1.0.2 \
-crate://crates.io/serde_urlencoded/0.5.1 \
-crate://crates.io/sha1/0.2.0 \
-crate://crates.io/strsim/0.6.0 \
-crate://crates.io/syn/0.11.11 \
-crate://crates.io/synom/0.11.3 \
-crate://crates.io/tar/0.4.13 \
-crate://crates.io/tempdir/0.3.5 \
-crate://crates.io/term_size/0.3.0 \
-crate://crates.io/textwrap/0.6.0 \
-crate://crates.io/thread_local/0.3.4 \
-crate://crates.io/time/0.1.37 \
-crate://crates.io/toml/0.2.1 \
-crate://crates.io/toml/0.4.2 \
-crate://crates.io/traitobject/0.1.0 \
-crate://crates.io/tungstenite/0.2.4 \
-crate://crates.io/typeable/0.1.2 \
-crate://crates.io/unicase/1.4.2 \
-crate://crates.io/unicode-bidi/0.3.3 \
-crate://crates.io/unicode-normalization/0.1.5 \
-crate://crates.io/unicode-segmentation/1.1.0 \
-crate://crates.io/unicode-width/0.1.4 \
-crate://crates.io/unicode-xid/0.0.4 \
-crate://crates.io/unix_socket/0.5.0 \
-crate://crates.io/unreachable/1.0.0 \
-crate://crates.io/untrusted/0.3.2 \
-crate://crates.io/url/1.5.1 \
-crate://crates.io/utf-8/0.7.1 \
-crate://crates.io/utf8-ranges/1.0.0 \
-crate://crates.io/uuid/0.5.1 \
-crate://crates.io/vec_map/0.8.0 \
-crate://crates.io/version_check/0.1.2 \
-crate://crates.io/void/1.0.2 \
-crate://crates.io/winapi/0.2.8 \
-crate://crates.io/winapi-build/0.1.1 \
-crate://crates.io/ws2_32-sys/0.2.1 \
-crate://crates.io/xattr/0.1.11 \
-git://github.com/advancedtelematic/rvi_sota_client \
-file://sota-client-autoprovision.service \
-file://sota-client-ostree.service \
-file://sota-client-uptane.service \
-"
-
-SRC_URI[index.md5sum] = "6a635e8a081b4d4ba4cebffd721c2d7d"
-SRC_URI[index.sha256sum] = "1913c41d4b8de89a931b6f9e418f83e70a083e12e6c247e8510ee932571ebae2"
-
-SYSTEMD_SERVICE_${PN} = "sota-client.service sota-client-autoprovision.service"
-
 DEPENDS += " openssl openssl-native dbus "
-RDEPENDS_${PN} = " libcrypto \
-                   libssl \
-                   bash \
-                   lshw \
-                   jq \
-                   curl \
-                   python \
-                   python-json \
-                   python-petname \
-                   "
+RDEPENDS_${PN} = " \
+bash \
+curl \
+libcrypto \
+libssl \
+lshw \
+jq \
+python-petname \
+sota-launcher \
+zip \
+"
 
 export SOTA_PACKED_CREDENTIALS
-export SOTA_AUTOPROVISION_CREDENTIALS
-export SOTA_AUTOPROVISION_URL
 
 do_compile_prepend() {
   export SOTA_VERSION=$(make sota-version)
@@ -198,7 +49,7 @@ do_install() {
 
   if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
     install -d ${D}/${systemd_unitdir}/system
-    if [ -n "$SOTA_AUTOPROVISION_CREDENTIALS" -o -n "$SOTA_PACKED_CREDENTIALS" ]; then
+    if [ -n "$SOTA_PACKED_CREDENTIALS" ]; then
       install -m 0644 ${WORKDIR}/sota-client-uptane.service ${D}/${systemd_unitdir}/system/sota-client.service
     else
       install -m 0644 ${WORKDIR}/sota-client-ostree.service ${D}/${systemd_unitdir}/system/sota-client.service
diff --git a/recipes-sota/rvi-sota-client/sota-installer_git.bb b/recipes-sota/rvi-sota-client/sota-installer_git.bb
new file mode 100644
index 0000000..09f6e5d
--- /dev/null
+++ b/recipes-sota/rvi-sota-client/sota-installer_git.bb
@@ -0,0 +1,25 @@
+require rvi-sota-client.inc
+
+
+SYSTEMD_SERVICE_${PN} = "sota-installer.service"
+
+DEPENDS += " rvi-sota-client "
+
+FILES_${PN} = " \
+${bindir}/sota-installer \
+${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota-installer.service', '', d)} \
+"
+
+do_compile_prepend() {
+  cd sota-installer
+}
+
+do_install() {
+  install -d ${D}${bindir}
+  install -m 0755 target/${TARGET_SYS}/release/sota-installer ${D}${bindir}
+
+  if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+    install -d ${D}/${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/sota-installer.service ${D}/${systemd_unitdir}/system/sota-installer.service
+  fi
+}
diff --git a/recipes-sota/rvi-sota-client/sota-launcher_git.bb b/recipes-sota/rvi-sota-client/sota-launcher_git.bb
new file mode 100644
index 0000000..e9874e7
--- /dev/null
+++ b/recipes-sota/rvi-sota-client/sota-launcher_git.bb
@@ -0,0 +1,15 @@
+require rvi-sota-client.inc
+
+
+DEPENDS += " rvi-sota-client "
+FILES_${PN} = "${bindir}/sota-launcher"
+
+
+do_compile_prepend() {
+  cd sota-launcher
+}
+
+do_install() {
+  install -d ${D}${bindir}
+  install -m 0755 target/${TARGET_SYS}/release/sota-launcher ${D}${bindir}
+}
diff --git a/recipes-sota/sota-tools/sota-tools_git.bb b/recipes-sota/sota-tools/sota-tools_git.bb
index 326ff20..5403d9a 100644
--- a/recipes-sota/sota-tools/sota-tools_git.bb
+++ b/recipes-sota/sota-tools/sota-tools_git.bb
@@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea"
 S = "${WORKDIR}/git"
 
 SRC_URI = "gitsm://github.com/advancedtelematic/sota-tools.git;branch=master"
-SRCREV = "4d7f22f50ab43be5bee61ad3e96cd9db4ef3a372"
+SRCREV = "216cb84db98e9b0f8c6c1c407f480c5dd0b3cf62"
 
 inherit cmake
 
-DEPENDS = "boost glib-2.0 curl"
+DEPENDS = "boost glib-2.0 curl libarchive"
 
 BBCLASSEXTEND = "native"
 
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index ff78681..260b048 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -24,7 +24,15 @@ fi
 METADIR="${SOURCEDIR}/../.."
 
 if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
-  source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+  if [ -z "$TEMPLATECONF" ] && [ -d ${METADIR}/meta-updater-${MACHINE}/conf ]; then
+    # Use the template configurations for the specified machine
+    TEMPLATECONF=${METADIR}/meta-updater-${MACHINE}/conf
+    source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+    unset TEMPLATECONF
+  else
+    # Use the default configurations or TEMPLATECONF set by the user
+    source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+  fi
   echo "METADIR  := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf
   cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf
   cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf