Merge from meta-agl-extra

14 files changed, 209 insertions, 118 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 8b3cbcd..59d4510 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -68,6 +68,10 @@ IMAGE_CMD_ostree () {
                 ln -s ../init.d/tmpfiles.sh usr/etc/rcS.d/S20tmpfiles.sh
         fi
 
+        # Preserve OSTREE_BRANCHNAME for future information
+        mkdir -p usr/share/sota/
+        echo -n "${OSTREE_BRANCHNAME}" > usr/share/sota/branchname
+
         # Preserve data in /home to be later copied to /sysroot/home by
         #   sysroot generating procedure
         mkdir -p usr/homedirs
@@ -122,7 +126,7 @@ IMAGE_CMD_ostree () {
         cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT} boot/initramfs-${checksum}
 
         # Copy image manifest
-        cat ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest | cut -d " " -f1,3 > usr/package.manifest
+        cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest
 
         cd ${WORKDIR}
 
@@ -154,6 +158,7 @@ IMAGE_CMD_ostreepush () {
         if [ ${OSTREE_PUSH_CREDENTIALS} ]; then
                 garage-push --repo=${OSTREE_REPO} \
                             --ref=${OSTREE_BRANCHNAME} \
-                            --credentials=${OSTREE_PUSH_CREDENTIALS}
+                            --credentials=${OSTREE_PUSH_CREDENTIALS} \
+                            --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt
         fi
 }
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index bee1ea4..74533dd 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -9,12 +9,9 @@
 
 inherit image
 
-IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot"
-
-# For qemux86 u-boot is not included in any live image and is built separately
-IMAGE_DEPENDS_otaimg_append_qemux86 = " virtual/bootloader:do_deploy"
-IMAGE_DEPENDS_otaimg_append_qemux86-64 = " virtual/bootloader:do_deploy"
-IMAGE_DEPENDS_otaimg_append_corei7-64-intel-common = " virtual/bootloader:do_deploy"
+IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \
+                        ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \
+                        ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}"
 
 calculate_size () {
         BASE=$1
@@ -52,6 +49,7 @@ calculate_size () {
 export OSTREE_OSNAME
 export OSTREE_BRANCHNAME
 export OSTREE_REPO
+export OSTREE_BOOTLOADER
 
 IMAGE_CMD_otaimg () {
         if ${@bb.utils.contains('IMAGE_FSTYPES', 'otaimg', 'true', 'false', d)}; then
@@ -76,32 +74,31 @@ IMAGE_CMD_otaimg () {
                 mkdir -p ${PHYS_SYSROOT}/boot/loader.0
                 ln -s loader.0 ${PHYS_SYSROOT}/boot/loader
 
-                touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt
+                if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then
+                        mkdir -p ${PHYS_SYSROOT}/boot/grub2
+                        touch ${PHYS_SYSROOT}/boot/grub2/grub.cfg
+                elif [ "${OSTREE_BOOTLOADER}" = "u-boot" ]; then
+                        touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt
+                else
+                        bberror "Invalid bootloader: ${OSTREE_BOOTLOADER}"
+                fi;
 
                 ostree --repo=${PHYS_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${OSTREE_BRANCHNAME}
-                ostree admin --sysroot=${PHYS_SYSROOT} deploy --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME}
-                
-                # Copy deployment /home to sysroot
+                export OSTREE_BOOT_PARTITION="/boot"
+                kargs_list=""
+                for arg in ${OSTREE_KERNEL_ARGS}; do
+                        kargs_list="${kargs_list} --karg-append=$arg"
+                done
+
+                ostree admin --sysroot=${PHYS_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME}
+
+                # Copy deployment /home and /var/sota to sysroot
                 HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX`
-                tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs
-                mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/
+                tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true
+>               mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
+                mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true
                 rm -rf ${HOME_TMP}
 
-                # Deploy device credentials
-                if [ -n "$SOTA_CREDENTIALS" ]; then
-                        if [ -f "$SOTA_CREDENTIALS" ]; then
-                                EXT=`basename $SOTA_CREDENTIALS | cut -d'.' -f2`
-                                if [ "$EXT" != "toml" ]; then
-                                        bbwarn "File\'s extension is not \'toml\', make sure you have the correct file"
-                                fi
-
-                                cat $SOTA_CREDENTIALS | sed 's/^package_manager = .*$/package_manager = "ostree"/' > ${PHYS_SYSROOT}/boot/sota.toml
-                                chmod 644 ${PHYS_SYSROOT}/boot/sota.toml
-                        else
-                                bberror "File $SOTA_CREDENTIALS does not exist"
-                        fi
-                fi
-
                 # Calculate image type
                 OTA_ROOTFS_SIZE=$(calculate_size `du -ks $PHYS_SYSROOT | cut -f 1`  "${IMAGE_OVERHEAD_FACTOR}" "${IMAGE_ROOTFS_SIZE}" "${IMAGE_ROOTFS_MAXSIZE}" `expr ${IMAGE_ROOTFS_EXTRA_SPACE}` "${IMAGE_ROOTFS_ALIGNMENT}")
 
@@ -118,7 +115,7 @@ IMAGE_CMD_otaimg () {
                 rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg
                 sync
                 dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg seek=$OTA_ROOTFS_SIZE count=$COUNT bs=1024
-                mkfs.ext4 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg -d ${PHYS_SYSROOT}
+                mkfs.ext4 -O ^64bit ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg -d ${PHYS_SYSROOT}
                 rm -rf ${PHYS_SYSROOT}
 
                 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg
diff --git a/classes/sdcard_image-dra7xx-evm-ota.bbclass b/classes/sdcard_image-dra7xx-evm-ota.bbclass
index f023649..179ed10 100644
--- a/classes/sdcard_image-dra7xx-evm-ota.bbclass
+++ b/classes/sdcard_image-dra7xx-evm-ota.bbclass
@@ -68,5 +68,8 @@ IMAGE_CMD_dra7xx-evm-sdimg-ota () {
                 xz -k "${SDIMG_OTA}"
                 ;;
         esac
+
+        rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota
+        ln -s ${IMAGE_NAME}.rootfs.dra7xx-evm-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota
 }
 
diff --git a/classes/sdcard_image-porter-ota.bbclass b/classes/sdcard_image-porter-ota.bbclass
index 5909b44..a9619dc 100644
--- a/classes/sdcard_image-porter-ota.bbclass
+++ b/classes/sdcard_image-porter-ota.bbclass
@@ -59,9 +59,6 @@ IMAGE_CMD_porter-sdimg-ota () {
                 dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
         fi
 
-        rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.porter-sdimg-ota
-        ln -s ${IMAGE_NAME}.porter-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.porter-sdimg-ota
-
         # Optionally apply compression
         case "${SDIMG_OTA_COMPRESSION}" in
         "gzip")
@@ -74,5 +71,8 @@ IMAGE_CMD_porter-sdimg-ota () {
                 xz -k "${SDIMG_OTA}"
                 ;;
         esac
+
+        rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota
+        ln -s ${IMAGE_NAME}.rootfs.porter-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota
 }
 
diff --git a/classes/sdcard_image-rpi-ota.bbclass b/classes/sdcard_image-rpi-ota.bbclass
index cb0c597..f5c35a2 100644
--- a/classes/sdcard_image-rpi-ota.bbclass
+++ b/classes/sdcard_image-rpi-ota.bbclass
@@ -72,6 +72,8 @@ SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota"
 # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
 FATPAYLOAD ?= ""
 
+IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
+IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "IMAGEDATESTAMP"
 IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "DATETIME"
 
 IMAGE_CMD_rpi-sdimg-ota () {
@@ -123,8 +125,10 @@ IMAGE_CMD_rpi-sdimg-ota () {
                 # Copy device tree overlays to dedicated folder
                 mmd -i ${WORKDIR}/boot.img overlays
                 for DTB in ${DT_OVERLAYS}; do
-                        DTB_BASE_NAME=`basename ${DTB} .dtb`
-                        mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtbo
+                        DTB_EXT=${DTB##*.}
+                        DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
+
+                        mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT}
                 done
         fi
 
@@ -145,6 +149,10 @@ IMAGE_CMD_rpi-sdimg-ota () {
                 done
         fi
 
+        # Add stamp file
+        echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
+        mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info ::
+
         # Burn Partitions
         sync
         dd if=${WORKDIR}/boot.img of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
@@ -171,6 +179,9 @@ IMAGE_CMD_rpi-sdimg-ota () {
                 xz -k "${SDIMG_OTA}"
                 ;;
         esac
+
+        rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota
+        ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota
 }
 
 ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; "
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index 5775dfa..102b70f 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/recipes-sota/ostree/ostree_git.bb
@@ -8,7 +8,9 @@ INHERIT_remove_class-native = "systemd"
 
 SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master"
 
-SRCREV="6517a8a27a1386e7cb5482e7cb2919fe92721ccf"
+SRCREV="3b09620c2738bce4ed45e099cf2e4c5df7671d39"
+
+PV = "2017.3-31-g3b09620c"
 
 S = "${WORKDIR}/git"
 
@@ -16,16 +18,20 @@ BBCLASSEXTEND = "native"
 
 DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs gtk-doc-native"
 DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
-
 DEPENDS_remove_class-native = "systemd-native"
 
-RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz os-release ca-certificates"
-RDEPENDS_${PN}_remove_class-native = "python-native os-release-native"
+RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz bash"
+RDEPENDS_${PN}_remove_class-native = "python-native"
 
-EXTRA_OECONF = "CFLAGS='-g' --with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man"
-EXTRA_OEMAKE = "CFLAGS='-g'"
+EXTRA_OECONF = "--with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man --with-smack --with-builtin-grub2-mkconfig"
 EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat"
 
+# Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the
+#  do_configure stage so we do depend on it
+SYSROOT_DIR = "${STAGING_DIR_TARGET}"
+SYSROOT_DIR_class-native = "${STAGING_DIR_NATIVE}"
+do_configure[vardeps] += "SYSROOT_DIR"
+
 SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
 SYSTEMD_REQUIRED_class-native = ""
 
@@ -55,7 +61,7 @@ do_compile_prepend() {
 export SYSTEMD_REQUIRED
 
 do_install_append() {
- if [ -n $SYSTEMD_REQUIRED ]; then
+ if [ -n ${SYSTEMD_REQUIRED} ]; then
   install -p -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service
   install -p -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service
  fi
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 c469ac7..9a3dbf9 100644
--- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
@@ -8,107 +8,154 @@ inherit cargo systemd
 
 S = "${WORKDIR}/git"
 
-SRCREV = "022cf8501f9eb84bf334a2490e6e0c67842882ab"
+# 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 = "878aa386e61bc253e4fae624ae62507710cd23f3"
 
 # Generate with:
 #   git describe --tags | cut -b2-
-PV = "0.2.30-2-g022cf85"
+# or from the rvi_sota_client repo:
+#   make package-version
+PV = "0.2.32-131-g878aa38"
 
 BBCLASSEXTEND = "native"
 
 FILES_${PN} = " \
+                /lib64 \
+                ${bindir}/canonical_json.py \
                 ${bindir}/sota_client \
                 ${bindir}/sota_sysinfo.sh \
                 ${bindir}/system_info.sh \
-                ${bindir}/sota_ostree.sh \
+                ${bindir}/sota_ostree.sh \
+                ${bindir}/sota_prov.sh \
                 ${sysconfdir}/sota_client.version \
                 ${sysconfdir}/sota_certificates \
+                /var/sota/sota_provisioning_credentials.p12 \
+                /var/sota/sota_provisioning_url.env \
+                ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota_client_autoprovision.service', '', d)} \
                 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota_client.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/aho-corasick/0.5.3 \
-crate://crates.io/bit-set/0.2.0 \
+crate://crates.io/aho-corasick/0.6.3 \
+crate://crates.io/base64/0.4.1 \
+crate://crates.io/bit-set/0.4.0 \
 crate://crates.io/bit-vec/0.4.3 \
-crate://crates.io/bitflags/0.4.0 \
 crate://crates.io/bitflags/0.7.0 \
-crate://crates.io/bytes/0.3.0 \
+crate://crates.io/byteorder/1.0.0 \
+crate://crates.io/bytes/0.4.1 \
 crate://crates.io/cfg-if/0.1.0 \
-crate://crates.io/chan-signal/0.1.7 \
-crate://crates.io/chan/0.1.18 \
-crate://crates.io/cookie/0.2.5 \
+crate://crates.io/chan/0.1.19 \
+crate://crates.io/chan-signal/0.2.0 \
+crate://crates.io/chrono/0.3.0 \
 crate://crates.io/crossbeam/0.2.10 \
-crate://crates.io/dbus/0.4.1 \
-crate://crates.io/env_logger/0.3.5 \
-crate://crates.io/gcc/0.3.40 \
+crate://crates.io/dbus/0.5.2 \
+crate://crates.io/deque/0.3.1 \
+crate://crates.io/dtoa/0.4.1 \
+crate://crates.io/env_logger/0.4.2 \
+crate://crates.io/error-chain/0.7.2 \
+crate://crates.io/foreign-types/0.2.0 \
+crate://crates.io/gcc/0.3.45 \
 crate://crates.io/gdi32-sys/0.2.0 \
 crate://crates.io/getopts/0.2.14 \
-crate://crates.io/hpack/0.2.0 \
 crate://crates.io/httparse/1.2.1 \
-crate://crates.io/hyper/0.9.14 \
+crate://crates.io/hyper/0.10.5 \
 crate://crates.io/idna/0.1.0 \
+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.1.16 \
-crate://crates.io/lazy_static/0.2.2 \
-crate://crates.io/lazycell/0.4.0 \
-crate://crates.io/libc/0.2.18 \
-crate://crates.io/log/0.3.6 \
+crate://crates.io/lazy_static/0.2.5 \
+crate://crates.io/libc/0.2.21 \
+crate://crates.io/log/0.3.7 \
 crate://crates.io/matches/0.1.4 \
 crate://crates.io/memchr/0.1.11 \
-crate://crates.io/mime/0.2.2 \
-crate://crates.io/mio/0.6.1 \
-crate://crates.io/miow/0.1.4 \
-crate://crates.io/net2/0.2.26 \
-crate://crates.io/nix/0.7.0 \
+crate://crates.io/memchr/1.0.1 \
+crate://crates.io/metadeps/1.1.1 \
+crate://crates.io/mime/0.2.3 \
 crate://crates.io/nom/1.2.4 \
-crate://crates.io/num_cpus/1.2.0 \
-crate://crates.io/openssl-sys/0.9.3 \
-crate://crates.io/openssl/0.9.3 \
-crate://crates.io/pkg-config/0.3.8 \
+crate://crates.io/num/0.1.37 \
+crate://crates.io/num-integer/0.1.33 \
+crate://crates.io/num-iter/0.1.33 \
+crate://crates.io/num-traits/0.1.37 \
+crate://crates.io/num_cpus/1.3.0 \
+crate://crates.io/openssl/0.9.10 \
+crate://crates.io/openssl-sys/0.9.10 \
+crate://crates.io/pem/0.2.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/regex-syntax/0.3.9 \
+crate://crates.io/rayon/0.6.0 \
+crate://crates.io/redox_syscall/0.1.17 \
 crate://crates.io/regex/0.1.80 \
+crate://crates.io/regex/0.2.1 \
+crate://crates.io/regex-syntax/0.3.9 \
+crate://crates.io/regex-syntax/0.4.0 \
+crate://crates.io/ring/0.7.1 \
 crate://crates.io/rust-crypto/0.2.36 \
-crate://crates.io/rustc-serialize/0.3.22 \
+crate://crates.io/rustc-serialize/0.3.23 \
 crate://crates.io/rustc_version/0.1.7 \
 crate://crates.io/semver/0.1.20 \
+crate://crates.io/serde/0.9.11 \
+crate://crates.io/serde_codegen_internals/0.14.1 \
+crate://crates.io/serde_derive/0.9.11 \
+crate://crates.io/serde_json/0.9.9 \
 crate://crates.io/sha1/0.2.0 \
-crate://crates.io/slab/0.3.0 \
-crate://crates.io/solicit/0.4.4 \
+crate://crates.io/syn/0.11.9 \
+crate://crates.io/synom/0.11.3 \
 crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/thread-id/3.0.0 \
 crate://crates.io/thread_local/0.2.7 \
-crate://crates.io/time/0.1.35 \
+crate://crates.io/thread_local/0.3.3 \
+crate://crates.io/time/0.1.36 \
 crate://crates.io/toml/0.2.1 \
-crate://crates.io/traitobject/0.0.1 \
+crate://crates.io/toml/0.3.1 \
+crate://crates.io/traitobject/0.1.0 \
+crate://crates.io/tungstenite/0.1.1 \
 crate://crates.io/typeable/0.1.2 \
 crate://crates.io/unicase/1.4.0 \
-crate://crates.io/unicode-bidi/0.2.3 \
-crate://crates.io/unicode-normalization/0.1.2 \
+crate://crates.io/unicode-bidi/0.2.5 \
+crate://crates.io/unicode-normalization/0.1.4 \
+crate://crates.io/unicode-xid/0.0.4 \
 crate://crates.io/unix_socket/0.5.0 \
-crate://crates.io/url/1.2.3 \
+crate://crates.io/unreachable/0.1.1 \
+crate://crates.io/untrusted/0.3.2 \
+crate://crates.io/url/1.4.0 \
 crate://crates.io/user32-sys/0.2.0 \
+crate://crates.io/utf-8/0.7.0 \
 crate://crates.io/utf8-ranges/0.1.3 \
+crate://crates.io/utf8-ranges/1.0.0 \
+crate://crates.io/uuid/0.4.0 \
 crate://crates.io/void/1.0.2 \
-crate://crates.io/winapi-build/0.1.1 \
 crate://crates.io/winapi/0.2.8 \
-crate://crates.io/ws/0.5.3 \
-crate://crates.io/ws2_32-sys/0.2.1 \
+crate://crates.io/winapi-build/0.1.1 \
 git://github.com/advancedtelematic/rvi_sota_client \
 "
+
 SRC_URI[index.md5sum] = "79f10f436dbf26737cc80445746f16b4"
 SRC_URI[index.sha256sum] = "86114b93f1f51aaf0aec3af0751d214b351f4ff9839ba031315c1b19dcbb1913"
 
-SYSTEMD_SERVICE_${PN} = "sota_client.service"
+SYSTEMD_SERVICE_${PN} = "sota_client.service sota_client_autoprovision.service"
 
-DEPENDS += " openssl dbus"
+DEPENDS += " openssl openssl-native dbus "
 RDEPENDS_${PN} = " libcrypto \
                    libssl \
                    bash \
                    lshw \
                    jq \
+                   curl \
+                   python \
+                   python-canonicaljson \
+                   python-json \
                    "
 
+export SOTA_AUTOPROVISION_CREDENTIALS
+export SOTA_AUTOPROVISION_URL
+
 do_compile_prepend() {
   export SOTA_VERSION=$(make sota-version)
 }
@@ -116,20 +163,38 @@ do_compile_prepend() {
 do_install() {
   install -d ${D}${bindir}
   install -m 0755 target/${TARGET_SYS}/release/sota_client ${D}${bindir}
-  install -m 0755 run/sota_sysinfo.sh ${D}${bindir}
+  install -m 0755 ${S}/run/sota_sysinfo.sh ${D}${bindir}
   ln -fs ${bindir}/sota_sysinfo.sh ${D}${bindir}/system_info.sh  # For compatibilty with old sota.toml files
-  install -m 0755 run/sota_ostree.sh ${D}${bindir}
+  install -m 0755 ${S}/run/sota_ostree.sh ${D}${bindir}
+  install -m 0755 ${S}/run/sota_prov.sh ${D}${bindir}
+  install -m 0755 ${S}/run/canonical_json.py ${D}${bindir}
 
   if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-    install -d ${D}${systemd_unitdir}/system
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'true', 'false', d)}; then
-      install -c ${S}/run/sota_client_ostree.service ${D}${systemd_unitdir}/system/sota_client.service
+    install -d ${D}/${systemd_unitdir}/system
+    if [ -n "$SOTA_AUTOPROVISION_CREDENTIALS" ]; then
+      install -c ${S}/run/sota_client_uptane_auto.service ${D}${systemd_unitdir}/system/sota_client.service
     else
-      install -c ${S}/run/sota_client.service ${D}${systemd_unitdir}/system/sota_client.service
+      install -c ${S}/run/sota_client_ostree.service ${D}${systemd_unitdir}/system/sota_client.service
     fi
+    install -c ${S}/run/sota_client_autoprovision.service ${D}${systemd_unitdir}/system/sota_client_autoprovision.service
   fi
 
   install -d ${D}${sysconfdir}
   echo `git log -1 --pretty=format:%H` > ${D}${sysconfdir}/sota_client.version
   install -c ${S}/run/sota_certificates ${D}${sysconfdir}
+  ln -fs /lib ${D}/lib64
+
+  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 "="`
+
+    if [ `date +%s` -ge `date -d "${EXPDATE}" +%s` ]; then
+      bberror "Certificate ${SOTA_AUTOPROVISION_CREDENTIALS} has expired on ${EXPDATE}"
+    fi
+
+    install -d ${D}/var
+    install -d ${D}/var/sota
+    install -m 0655 $SOTA_AUTOPROVISION_CREDENTIALS ${D}/var/sota/sota_provisioning_credentials.p12
+    echo "SOTA_GATEWAY_URI=$SOTA_AUTOPROVISION_URL" > ${D}/var/sota/sota_provisioning_url.env
+  fi
+
 }
diff --git a/recipes-sota/sota-tools/sota-tools_git.bb b/recipes-sota/sota-tools/sota-tools_git.bb
index e472ff8..326ff20 100644
--- a/recipes-sota/sota-tools/sota-tools_git.bb
+++ b/recipes-sota/sota-tools/sota-tools_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea"
 S = "${WORKDIR}/git"
 
 SRC_URI = "gitsm://github.com/advancedtelematic/sota-tools.git;branch=master"
-SRCREV = "c6ecec3e86c423dd6caaa362a5ff0a1a6f4072a8"
+SRCREV = "4d7f22f50ab43be5bee61ad3e96cd9db4ef3a372"
 
 inherit cmake
 
diff --git a/recipes-support/libgit2/libgit2-release.inc b/recipes-support/libgit2/libgit2-release.inc
deleted file mode 100644
index 62a13cf..0000000
--- a/recipes-support/libgit2/libgit2-release.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-require libgit2.inc
-SRC_URI = "https://github.com/libgit2/libgit2/archive/v${PV}.tar.gz"
diff --git a/recipes-support/libgit2/libgit2.inc b/recipes-support/libgit2/libgit2.inc
deleted file mode 100644
index a0da834..0000000
--- a/recipes-support/libgit2/libgit2.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "the Git linkable library"
-HOMEPAGE = "http://libgit2.github.com/"
-LICENSE = "GPL-2.0-with-GCC-exception"
-
-DEPENDS = "openssl zlib"
-
-inherit cmake
-
-# CLAR = tests, needs python-native
-EXTRA_OECMAKE = "\
- -DTHREADSAFE=ON \
- -DBUILD_CLAR=OFF \
- -DSHA1_TYPE="builtin" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DBUILD_SHARED_LIBS=ON \
- -DBUILD_EXAMPLES=OFF \
-"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes-support/libgit2/libgit2_0.24.1.bb b/recipes-support/libgit2/libgit2_0.24.1.bb
deleted file mode 100644
index 2d0c6ff..0000000
--- a/recipes-support/libgit2/libgit2_0.24.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-LIC_FILES_CHKSUM = "file://COPYING;md5=34197a479f637beb9e09e56893f48bc2"
-SRC_URI[md5sum] = "3674ca2d40388b1175e25b6f5a3a82ad"
-SRC_URI[sha256sum] = "60198cbb34066b9b5c1613d15c0479f6cd25f4aef42f7ec515cd1cc13a77fede"
-require libgit2-release.inc
diff --git a/recipes-support/lshw/lshw_02.16.bb b/recipes-support/lshw/lshw_02.16.bb
index 53b0d65..99901ff 100644
--- a/recipes-support/lshw/lshw_02.16.bb
+++ b/recipes-support/lshw/lshw_02.16.bb
@@ -14,12 +14,11 @@ DEPENDS = "pciutils \
     usbutils"
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
-PR="r1"
-
 SRC_URI="http://ezix.org/software/files/lshw-B.${PV}.tar.gz \
     file://cross-compile.patch \
     file://ldflags.patch \
     "
+
 SRC_URI[md5sum] = "67479167add605e8f001097c30e96d0d"
 SRC_URI[sha256sum] = "809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb"
 
diff --git a/recipes-support/python-canonicaljson/python-canonicaljson.bb b/recipes-support/python-canonicaljson/python-canonicaljson.bb
new file mode 100644
index 0000000..d8a0728
--- /dev/null
+++ b/recipes-support/python-canonicaljson/python-canonicaljson.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "python-canonicaljson recipe"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+
+SRCREV = "92e2c06871cc275c2a8b8e3e899141a212aae0e8"
+SRC_URI = "git://github.com/matrix-org/python-canonicaljson.git"
+S = "${WORKDIR}/git"
+
+# Generate with:
+#   git describe --tags | cut -b2-
+PV = "1.0.0"
+inherit setuptools
+
+RDEPENDS_${PN} = "\
+        python-simplejson \
+        python-frozendict \
+        "
diff --git a/recipes-support/python-frozendict/python-frozendict.bb b/recipes-support/python-frozendict/python-frozendict.bb
new file mode 100644
index 0000000..79fe5c8
--- /dev/null
+++ b/recipes-support/python-frozendict/python-frozendict.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "python-frozendict recipe"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE.txt;md5=f4da037a49c09b456fdbbc7a5bd36132"
+
+SRCREV = "c5d16bafcca7b72ff3e8f40d3a9081e4c9233f1b"
+SRC_URI = "git://github.com/slezica/python-frozendict.git"
+S = "${WORKDIR}/git"
+
+PV = "1.2"
+inherit setuptools
+