Merge branch 'morty' into pyro

6 files changed, 63 insertions, 27 deletions

diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index fa71af8..4f9d131 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -5,35 +5,41 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 DEPENDS = "boost curl openssl jansson libsodium ostree"
-SRCREV = "4e9344ae375a444f02b964dca52fe808010d17df"
-PV = "1.0+git${SRCPV}"
+RDEPENDS_${PN} = "lshw"
 
 SRC_URI = " \
   git://github.com/advancedtelematic/aktualizr \
   file://aktualizr-manual-provision.service \
+  file://aktualizr-autoprovision.service \
+  file://sota_autoprov.toml \
   "
+SRCREV = "7ca3af4e2f47ca7a3a67866023de3f8a97425991"
+PV = "1.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 SYSTEMD_SERVICE_${PN} = "aktualizr.service"
 
 inherit cmake systemd
 
-EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON"
+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" ]; then
-      bbwarn "Aktualizr recipe currently lacks support for SOTA_AUTOPROVISION_CREDENTIALS. No systemd service will be created"
+    if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" -o -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
     else
       install -d ${D}/${systemd_unitdir}/system
       install -m 0644 ${WORKDIR}/aktualizr-manual-provision.service ${D}/${systemd_unitdir}/system/aktualizr.service
     fi
 }
 
-RDEPENDS = ""
-
 FILES_${PN} = " \
                 ${bindir}/aktualizr \
                 ${systemd_unitdir}/system/aktualizr.service \
+                /usr/lib/sota/sota.toml \
                 "
diff --git a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
new file mode 100644
index 0000000..fd0ab09
--- /dev/null
+++ b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Aktualizr SOTA Client
+Wants=network-online.target
+After=network.target network-online.target
+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
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-sota/aktualizr/files/sota_autoprov.toml b/recipes-sota/aktualizr/files/sota_autoprov.toml
new file mode 100644
index 0000000..8799553
--- /dev/null
+++ b/recipes-sota/aktualizr/files/sota_autoprov.toml
@@ -0,0 +1,18 @@
+[device]
+packages_dir = "/tmp/packages_dir"
+certificates_directory = "/var/sota"
+system_info = "system_info.sh"
+
+[tls]
+ca_file = "root.crt"
+client_certificate = "client.pem"
+pkey_file = "pkey.pem"
+
+[uptane]
+metadata_path = "/var/sota/metadata"
+private_key_path = "ecukey.der"
+public_key_path = "ecukey.pub"
+
+[provision]
+p12_path = "sota_provisioning_credentials.p12"
+
diff --git a/recipes-sota/ostree-initrd/files/init.sh b/recipes-sota/ostree-initrd/files/init.sh
index 1814ca3..0b0693d 100644
--- a/recipes-sota/ostree-initrd/files/init.sh
+++ b/recipes-sota/ostree-initrd/files/init.sh
@@ -1,17 +1,13 @@
 #!/bin/sh
-
-# global variables
-
-SMACK=n
-DEBUG=n
+set -eu
 
 # -------------------------------------------
 
-log_info() { echo "$0[$$]: $@" >&2; }
-log_error() { echo "$0[$$]: ERROR $@" >&2; }
+log_info() { echo "$0[$$]: $*" >&2; }
+log_error() { echo "$0[$$]: ERROR $*" >&2; }
 
 do_mount_fs() {
-        log_info "mounting FS: $@"
+        log_info "mounting FS: $*"
         [[ -e /proc/filesystems ]] && { grep -q "$1" /proc/filesystems || { log_error "Unknown filesystem"; return 1; } }
         [[ -d "$2" ]] || mkdir -p "$2"
         [[ -e /proc/mounts ]] && { grep -q -e "^$1 $2 $1" /proc/mounts && { log_info "$2 ($1) already mounted"; return 0; } }
@@ -26,10 +22,10 @@ bail_out() {
 }
 
 get_ostree_sysroot() {
-        for opt in `cat /proc/cmdline`; do
-                arg=`echo $opt | cut -d'=' -f1`
-                if [ $arg == "ostree_root" ]; then
-                        echo $opt | cut -d'=' -f2-
+        for opt in $(cat /proc/cmdline); do
+                arg=$(echo "$opt" | cut -d'=' -f1)
+                if [ "$arg" == "ostree_root" ]; then
+                        echo "$opt" | cut -d'=' -f2-
                         return
                 fi
         done
@@ -38,7 +34,7 @@ get_ostree_sysroot() {
 
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/ostree
 
-log_info "starting initrd script"
+log_info "Starting OSTree initrd script"
 
 do_mount_fs proc /proc
 do_mount_fs sysfs /sys
@@ -50,8 +46,6 @@ do_mount_fs tmpfs /run
 
 # check if smack is active (and if so, mount smackfs)
 grep -q smackfs /proc/filesystems && {
-        SMACK=y
-
         do_mount_fs smackfs /sys/fs/smackfs
 
         # adjust current label and network label
@@ -62,14 +56,20 @@ grep -q smackfs /proc/filesystems && {
 mkdir -p /sysroot
 ostree_sysroot=$(get_ostree_sysroot)
 
-mount $ostree_sysroot /sysroot || bail_out "Unable to mount $ostree_sysroot as physical sysroot"
+mount "$ostree_sysroot" /sysroot || {
+        # The SD card in the R-Car M3 takes a bit of time to come up
+        # Retry the mount if it fails the first time
+        log_info "Mounting $ostree_sysroot failed, waiting 5s for the device to be available..."
+        sleep 5
+        mount "$ostree_sysroot" /sysroot || bail_out "Unable to mount $ostree_sysroot as physical sysroot"
+}
 ostree-prepare-root /sysroot
 
 # move mounted devices to new root
 cd /sysroot
 for x in dev proc; do
         log_info "Moving /$x to new rootfs"
-        mount -o move /$x $x
+        mount -o move "/$x" "$x"
 done
 
 # switch to new rootfs
diff --git a/recipes-sota/ostree-initrd/ostree-initrd.bb b/recipes-sota/ostree-initrd/ostree-initrd.bb
index b721405..6046c81 100644
--- a/recipes-sota/ostree-initrd/ostree-initrd.bb
+++ b/recipes-sota/ostree-initrd/ostree-initrd.bb
@@ -5,7 +5,7 @@ SRC_URI = "file://init.sh"
 
 S = "${WORKDIR}"
 
-PV = "2"
+PV = "3"
 
 do_install() {
         install -dm 0755 ${D}/etc
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 b0d91eb..5a08670 100644
--- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
@@ -30,8 +30,6 @@ FILES_${PN} = " \
                 ${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)} \
               "