Merge branch 'pyro' of https://github.com/advancedtelematic/meta-updater into feat/PRO-4199/oe-selftest

10 files changed, 165 insertions, 106 deletions

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
new file mode 100644
index 0000000..7255a72
--- /dev/null
+++ b/CONTRIBUTING.adoc
@@ -0,0 +1,15 @@
+= Contributing
+
+We welcome pull requests from everyone. Here are some notes that are useful for people working on meta-updater (this repository) and https://github.com/advancedtelematic/aktualizr[aktualizr].
+
+== Options for local.conf/site.conf
+
+[options="header"]
+|======================
+| Option                              | Effect
+| `require classes/sota_bleeding.inc` | Always build the latest master of Aktualizr
+| `BRANCH_pn-aktualizr = "mybranch"`
+`BRANCH_pn-aktualizr-native = "mybranch"` | Build `mybranch` of Aktualizr (note that both of these need to be set). This will normally be used with `require classes/sota_bleeding.inc`
+| `TOOLCHAIN_HOST_TASK_append = " nativesdk-cmake "` | Use with `bitbake -c populate_sdk core-image-minimal` to build a SDK
+
+
diff --git a/classes/sdcard_image-rpi-ota.bbclass b/classes/sdcard_image-rpi-ota.bbclass
index 81d71e9..9c859fe 100644
--- a/classes/sdcard_image-rpi-ota.bbclass
+++ b/classes/sdcard_image-rpi-ota.bbclass
@@ -73,10 +73,6 @@ SDIMG_OTA = "${IMGDEPLOYDIR}/${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 () {
 
         # Align partitions
@@ -151,7 +147,7 @@ IMAGE_CMD_rpi-sdimg-ota () {
         fi
 
         # Add stamp file
-        echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
+        echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
         mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info ::
 
         # Burn Partitions
diff --git a/classes/sota_bleeding.inc b/classes/sota_bleeding.inc
index 77d004b..fc5947d 100644
--- a/classes/sota_bleeding.inc
+++ b/classes/sota_bleeding.inc
@@ -1,2 +1 @@
 SRCREV_pn-aktualizr ?= "${AUTOREV}"
-SRCREV_pn-aktualizr-native ?= "${AUTOREV}"
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
index 48777b2..4f9fe4f 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
@@ -39,8 +39,8 @@ do_install_append() {
     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
-        install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}/usr/lib/sota/sota.toml
+        install -d ${D}${libdir}/sota
+        install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}${libdir}/sota/sota.toml
 
       # deploy SOTA credentials
       if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then
@@ -57,6 +57,6 @@ do_install_append() {
 
 FILES_${PN} = " \
                 ${systemd_unitdir}/system/aktualizr.service \
-                /usr/lib/sota/sota.toml \
+                ${libdir}/sota/sota.toml \
                 /var/sota/sota_provisioning_credentials.zip \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
index a01ef48..21e38c9 100644
--- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
@@ -22,13 +22,13 @@ inherit systemd
 do_install() {
     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
+    install -d ${D}${libdir}/sota
     aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \
-        -i ${WORKDIR}/sota_implicit_prov.toml -o ${D}/usr/lib/sota/sota.toml -p ${D}
+        -i ${WORKDIR}/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D}
 }
 
 FILES_${PN} = " \
                 ${systemd_unitdir}/system/aktualizr.service \
-                /usr/lib/sota/sota.toml \
-                /usr/lib/sota/root.crt \
+                ${libdir}/sota/sota.toml \
+                ${libdir}/sota/root.crt \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-native_git.bb b/recipes-sota/aktualizr/aktualizr-native_git.bb
deleted file mode 100644
index b89e9de..0000000
--- a/recipes-sota/aktualizr/aktualizr-native_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require aktualizr_common.inc
-
-DEPENDS = "boost-native glib-2.0-native curl-native openssl-native libarchive-native libsodium-native"
-
-inherit native
-
-EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF -DAKTUALIZR_VERSION=${PV}"
-
-do_install_append () {
-    rm ${D}${bindir}/aktualizr
-    rm ${D}${bindir}/aktualizr_cert_provider
-    rm ${D}${bindir}/garage-deploy
-}
-
-FILES_${PN} = " \
-                ${bindir}/aktualizr_implicit_writer \
-                ${bindir}/garage-push \
-                "
diff --git a/recipes-sota/aktualizr/aktualizr_common.inc b/recipes-sota/aktualizr/aktualizr_common.inc
deleted file mode 100644
index 79c5e37..0000000
--- a/recipes-sota/aktualizr/aktualizr_common.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Aktualizr SOTA Client"
-DESCRIPTION = "SOTA Client application written in C++"
-HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
-SECTION = "base"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
-
-PV = "1.0+git${SRCPV}"
-PR = "7"
-
-SRC_URI = " \
-  git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \
-  "
-SRCREV = "67c4f44c4136d16871726449502e3926098e8524"
-BRANCH ?= "master"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 1b3986a..470c9bf 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -1,22 +1,52 @@
-require aktualizr_common.inc
+SUMMARY = "Aktualizr SOTA Client"
+DESCRIPTION = "SOTA Client application written in C++"
+HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
+SECTION = "base"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "boost curl jansson openssl libarchive libsodium ostree"
-RDEPENDS_${PN} = "lshw"
+DEPENDS = "boost curl openssl libarchive libsodium "
+DEPENDS_append_class-target = "jansson ostree ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' libp11', '', d)} "
+DEPENDS_append_class-native = "glib-2.0-native "
 
-DEPENDS_append = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' libp11', '', d)}"
-RDEPENDS_${PN}_append = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)}"
-RDEPENDS_${PN}_append = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm-test', ' softhsm softhsm-testtoken', '', d)}"
+RDEPENDS_${PN}_class-target = "lshw "
+RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)} "
+RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm-test', ' softhsm softhsm-testtoken', '', d)} "
 
-inherit systemd
+PV = "1.0+git${SRCPV}"
+PR = "7"
 
-EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_OSTREE=ON ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} -DAKTUALIZR_VERSION=${PV}"
+SRC_URI = " \
+  git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \
+  "
+SRCREV = "67c4f44c4136d16871726449502e3926098e8524"
+BRANCH ?= "master"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+BBCLASSEXTEND =+ "native"
+
+EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DAKTUALIZR_VERSION=${PV} "
+EXTRA_OECMAKE_append_class-target = "-DBUILD_OSTREE=ON ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} "
+EXTRA_OECMAKE_append_class-native = "-DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF "
 
 do_install_append () {
-    rm ${D}${bindir}/aktualizr_cert_provider
-    rm ${D}${bindir}/aktualizr_implicit_writer
-    rm ${D}${bindir}/garage-deploy
+    rm -f ${D}${bindir}/aktualizr_cert_provider
+    rm -f ${D}${bindir}/garage-deploy
+}
+do_install_append_class-target () {
+    rm -f ${D}${bindir}/aktualizr_implicit_writer
+}
+do_install_append_class-native () {
+    rm -f ${D}${bindir}/aktualizr
 }
 
-FILES_${PN} = " \
+FILES_${PN}_class-target = " \
                 ${bindir}/aktualizr \
                 "
+FILES_${PN}_class-native = " \
+                ${bindir}/aktualizr_implicit_writer \
+                ${bindir}/garage-push \
+                "
diff --git a/recipes-sota/garage-sign/garage-sign.bb b/recipes-sota/garage-sign/garage-sign.bb
new file mode 100644
index 0000000..0da35bb
--- /dev/null
+++ b/recipes-sota/garage-sign/garage-sign.bb
@@ -0,0 +1,28 @@
+SUMMARY = "garage-sign"
+DESCRIPTION = "Metadata signing tool for ATS Garage"
+HOMEPAGE = "https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/index.html"
+SECTION = "base"
+LICENSE = "CLOSED"
+LIC_FILES_CHKSUM = "file://${S}/docs/LICENSE;md5=3025e77db7bd3f1d616b3ffd11d54c94"
+DEPENDS = ""
+
+PV = "0.2.0-6-g6af6ecd"
+
+SRC_URI = " \
+  https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/cli-${PV}.tgz \
+  "
+
+SRC_URI[md5sum] = "496ee983f03218f3e3f8d4f56c5d8d8d"
+SRC_URI[sha256sum] = "1ab296d7abadc40f5ad851ae62a7dff8423bd7167fa9fdc1972c88c5fe90dd40"
+
+S = "${WORKDIR}/${BPN}"
+
+BBCLASSEXTEND =+ "native"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m "0755" -t ${D}${bindir} ${S}/bin/*
+    install -d ${D}${libdir}
+    install -m "0644" -t ${D}${libdir} ${S}/lib/*
+}
+
diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client.inc b/recipes-sota/rvi-sota-client/rvi-sota-client.inc
index 6718bab..712b9b3 100644
--- a/recipes-sota/rvi-sota-client/rvi-sota-client.inc
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client.inc
@@ -13,12 +13,12 @@ SRC_URI[index.md5sum] = "6a635e8a081b4d4ba4cebffd721c2d7d"
 SRC_URI[index.sha256sum] = "1913c41d4b8de89a931b6f9e418f83e70a083e12e6c247e8510ee932571ebae2"
 
 # also update PV and SRC_URI crates when updating SRCREV
-SRCREV = "d41540a54ee7bba20835b337f3a477d5f1386c76"
+SRCREV = "be8ec83af2051a2b2499ce8878242771c65f0f1c"
 
 PR = "1"
 
 # generate with: `make package-version`
-PV = "0.2.33-76-gd41540a"
+PV = "0.2.34-8-gbe8ec83"
 
 # generate with: `make yocto-version`
 SRC_URI = " \
@@ -27,114 +27,142 @@ file://sota-client-autoprovision.service \
 file://sota-client-ostree.service \
 file://sota-client-uptane.service \
 file://sota-installer.service \
+crate://crates.io/adler32/1.0.2 \
 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/atty/0.2.3 \
+crate://crates.io/backtrace/0.3.3 \
+crate://crates.io/backtrace-sys/0.1.15 \
+crate://crates.io/base64/0.6.0 \
+crate://crates.io/bincode/0.9.0 \
 crate://crates.io/bit-set/0.4.0 \
 crate://crates.io/bit-vec/0.4.4 \
+crate://crates.io/bitflags/0.7.0 \
 crate://crates.io/bitflags/0.9.1 \
+crate://crates.io/block-buffer/0.2.0 \
+crate://crates.io/byte-tools/0.2.0 \
 crate://crates.io/byteorder/1.1.0 \
-crate://crates.io/bytes/0.4.4 \
+crate://crates.io/bytes/0.4.5 \
+crate://crates.io/cc/1.0.1 \
 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/chan-signal/0.3.1 \
 crate://crates.io/chrono/0.4.0 \
-crate://crates.io/clap/2.25.0 \
+crate://crates.io/clap/2.26.2 \
+crate://crates.io/coco/0.1.1 \
+crate://crates.io/constant_time_eq/0.1.3 \
 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/crossbeam/0.3.0 \
 crate://crates.io/crypt32-sys/0.2.0 \
+crate://crates.io/crypto-mac/0.4.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/dbus/0.5.4 \
+crate://crates.io/digest/0.6.2 \
+crate://crates.io/dtoa/0.4.2 \
+crate://crates.io/either/1.2.0 \
 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/fake-simd/0.1.2 \
+crate://crates.io/filetime/0.1.14 \
 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/fuchsia-zircon/0.2.1 \
+crate://crates.io/fuchsia-zircon-sys/0.2.0 \
+crate://crates.io/futures/0.1.16 \
+crate://crates.io/gcc/0.3.54 \
+crate://crates.io/generic-array/0.8.3 \
+crate://crates.io/getopts/0.2.15 \
 crate://crates.io/hex/0.2.0 \
+crate://crates.io/hmac/0.4.2 \
 crate://crates.io/httparse/1.2.3 \
-crate://crates.io/hyper/0.10.12 \
+crate://crates.io/hyper/0.10.13 \
 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/iovec/0.1.1 \
+crate://crates.io/itoa/0.3.4 \
 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/lazy_static/0.2.9 \
+crate://crates.io/libc/0.2.32 \
+crate://crates.io/libdbus-sys/0.1.1 \
+crate://crates.io/libflate/0.1.11 \
 crate://crates.io/log/0.3.8 \
-crate://crates.io/maplit/0.1.4 \
+crate://crates.io/maplit/0.1.5 \
 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/net2/0.2.31 \
+crate://crates.io/nodrop/0.1.9 \
 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/num_cpus/1.7.0 \
+crate://crates.io/odds/0.2.25 \
+crate://crates.io/openssl/0.9.19 \
+crate://crates.io/openssl-sys/0.9.19 \
+crate://crates.io/pem/0.4.1 \
 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/rand/0.3.17 \
+crate://crates.io/rayon/0.8.2 \
+crate://crates.io/rayon-core/1.2.1 \
+crate://crates.io/redox_syscall/0.1.31 \
+crate://crates.io/redox_termios/0.1.1 \
 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/ring/0.12.1 \
 crate://crates.io/rust-crypto/0.2.36 \
-crate://crates.io/rustc-demangle/0.1.4 \
+crate://crates.io/rustc-demangle/0.1.5 \
 crate://crates.io/rustc-serialize/0.3.24 \
-crate://crates.io/schannel/0.1.7 \
+crate://crates.io/safemem/0.2.0 \
+crate://crates.io/schannel/0.1.8 \
+crate://crates.io/scopeguard/0.3.2 \
 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/security-framework/0.1.16 \
+crate://crates.io/security-framework-sys/0.1.16 \
+crate://crates.io/serde/1.0.15 \
+crate://crates.io/serde_derive/1.0.15 \
+crate://crates.io/serde_derive_internals/0.16.0 \
+crate://crates.io/serde_json/1.0.3 \
 crate://crates.io/serde_urlencoded/0.5.1 \
 crate://crates.io/sha1/0.2.0 \
+crate://crates.io/sha2/0.6.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/termion/1.5.1 \
+crate://crates.io/textwrap/0.8.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/toml/0.4.5 \
 crate://crates.io/traitobject/0.1.0 \
-crate://crates.io/tungstenite/0.2.4 \
+crate://crates.io/tungstenite/0.5.0 \
 crate://crates.io/typeable/0.1.2 \
+crate://crates.io/typenum/1.9.0 \
 crate://crates.io/unicase/1.4.2 \
-crate://crates.io/unicode-bidi/0.3.3 \
+crate://crates.io/unicode-bidi/0.3.4 \
 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/untrusted/0.5.1 \
 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/vcpkg/0.2.2 \
 crate://crates.io/vec_map/0.8.0 \
 crate://crates.io/version_check/0.1.3 \
 crate://crates.io/void/1.0.2 \