Merge pull request #101 from advancedtelematic/feat/mergemorty

Merge current progress from morty to pyro

21 files changed, 148 insertions, 75 deletions

diff --git a/README.adoc b/README.adoc
index e26497c..d625780 100644
--- a/README.adoc
+++ b/README.adoc
@@ -4,13 +4,13 @@ This layer enables over-the-air updates (OTA) with https://github.com/ostreedev/
 
 https://github.com/ostreedev/ostree[OSTree] is a tool for atomic full file system upgrades with rollback capability. OSTree has several advantages over traditional dual-bank systems, but the most important one is that it minimizes network bandwidth and data storage footprint by sharing files with the same contents across file system deployments.
 
-https://github.com/advancedtelematic/rvi_sota_client[RVI SOTA client] adds authentication and provisioning capabilities to OTA and is integrated with OSTree. It connects to https://github.com/advancedtelematic/rvi_sota_server[RVI SOTA server].
+https://github.com/advancedtelematic/rvi_sota_client[RVI SOTA client] and/or https://github.com/advancedtelematic/aktualizr[aktualizr] add authentication and provisioning capabilities to OTA and are integrated with OSTree. You can connect with the open-source https://github.com/advancedtelematic/rvi_sota_server[RVI SOTA server] or sign up for a free account at https://app.atsgarage.com[ATS Garage] to get started.
 
 == Build
 
 === Quickstart
 
-If you don't already have a Yocto project that you want to add OTA to, you can use the https://github.com/advancedtelematic/garage-quickstart-rpi[ATS Garage Quickstart] project to rapidly get up and running on a Raspberry Pi. It takes a standard https://www.yoctoproject.org/tools-resources/projects/poky[poky] distribution, and adds OTA and OSTree capabilities. For a detailed getting started tutorial see the https://github.com/advancedtelematic/garage-quickstart-rpi/blob/master/README.adoc[README].
+If you don't already have a Yocto project that you want to add OTA to, you can use the https://docs.atsgarage.com/quickstarts/raspberry-pi.html[ATS Garage Quickstart] project to rapidly get up and running on a Raspberry Pi. It takes a standard https://www.yoctoproject.org/tools-resources/projects/poky[poky] distribution, and adds OTA and OSTree capabilities.
 
 === Adding meta-updater capabilities to your build
 
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 2a74e51..72d7df5 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -203,7 +203,7 @@ IMAGE_CMD_ostree () {
 IMAGE_TYPEDEP_ostreepush = "ostree"
 IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot"
 IMAGE_CMD_ostreepush () {
-        if [ ${OSTREE_PUSH_CREDENTIALS} ]; then
+        if [ -n "${OSTREE_PUSH_CREDENTIALS}" ]; then
                 garage-push --repo=${OSTREE_REPO} \
                             --ref=${OSTREE_BRANCHNAME} \
                             --credentials=${OSTREE_PUSH_CREDENTIALS} \
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 8108d51..09c30ff 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -92,12 +92,13 @@ IMAGE_CMD_otaimg () {
                         kargs_list="${kargs_list} --karg-append=$arg"
                 done
 
-                ostree admin --sysroot=${PHYS_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME}
+                ostree admin --sysroot=${PHYS_SYSROOT} deploy ${kargs_list} --os=${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 ./var/sota || true
-                mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
+                tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota ./var/local || true
+                mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
+                mv ${HOME_TMP}/var/local ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
                 # Create /var/sota if it doesn't exist yet
                 mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true
                 mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true
diff --git a/classes/sdcard_image-rpi-ota.bbclass b/classes/sdcard_image-rpi-ota.bbclass
index 9022aaf..81d71e9 100644
--- a/classes/sdcard_image-rpi-ota.bbclass
+++ b/classes/sdcard_image-rpi-ota.bbclass
@@ -61,7 +61,7 @@ IMAGE_DEPENDS_rpi-sdimg-ota = " \
 IMAGE_TYPEDEP_rpi-sdimg-ota = "otaimg"
 
 # SD card image name
-SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota"
+SDIMG_OTA = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota"
 
 # Compression method to apply to SDIMG_OTA after it has been created. Supported
 # compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg-ota file
@@ -165,9 +165,6 @@ IMAGE_CMD_rpi-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}.rpi-sdimg-ota
-        ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rpi-sdimg-ota
-
         # Optionally apply compression
         case "${SDIMG_OTA_COMPRESSION}" in
         "gzip")
@@ -180,9 +177,6 @@ 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/classes/sota.bbclass b/classes/sota.bbclass
index 2761111..5073e29 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -5,6 +5,7 @@ python __anonymous() {
 
 OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}"
 
+SOTA_CLIENT ??= "aktualizr"
 IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT}"
 IMAGE_CLASSES += " image_types_ostree image_types_ota"
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush otaimg wic', ' ', d)}"
@@ -24,6 +25,7 @@ SOTA_MACHINE ??="none"
 SOTA_MACHINE_raspberrypi2 ?= "raspberrypi"
 SOTA_MACHINE_raspberrypi3 ?= "raspberrypi"
 SOTA_MACHINE_porter ?= "porter"
+SOTA_MACHINE_m3ulcb = "m3ulcb"
 SOTA_MACHINE_intel-corei7-64 ?= "minnowboard"
 SOTA_MACHINE_qemux86-64 ?= "qemux86-64"
 SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi"
diff --git a/classes/sota_m3ulcb.bbclass b/classes/sota_m3ulcb.bbclass
new file mode 100644
index 0000000..21d04ba
--- /dev/null
+++ b/classes/sota_m3ulcb.bbclass
@@ -0,0 +1,9 @@
+# Commit united image to OSTree, not just uImage
+OSTREE_KERNEL = "Image"
+
+EXTRA_IMAGEDEPENDS_append_sota = " m3ulcb-ota-bootfiles"
+IMAGE_CLASSES_append_sota = " image_types_uboot "
+IMAGE_BOOT_FILES_sota += "m3ulcb-ota-bootfiles/*"
+
+OSTREE_BOOTLOADER ?= "u-boot"
+UBOOT_MACHINE_sota = "m3ulcb_defconfig"
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass
index 9b103ff..cc6b666 100644
--- a/classes/sota_raspberrypi.bbclass
+++ b/classes/sota_raspberrypi.bbclass
@@ -1,5 +1,5 @@
 IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}"
-IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
+IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota.xz', 'rpi-sdimg.xz', d)}"
 
 IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg rpi-sdimg.xz', '', d)}"
 
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index 1775d92..ea1ca95 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -7,7 +7,6 @@
 DISTRO_FEATURES_append = " sota"
 DISTRO_FEATURES_NATIVE_append = " sota"
 INHERIT += " sota"
-SOTA_CLIENT ?= "aktualizr"
 # Prelinking increases the size of downloads and causes build errors
 USER_CLASSES_remove = "image-prelink"
 
diff --git a/conf/include/bblayers/sota_m3ulcb.inc b/conf/include/bblayers/sota_m3ulcb.inc
new file mode 100644
index 0000000..04f78e4
--- /dev/null
+++ b/conf/include/bblayers/sota_m3ulcb.inc
@@ -0,0 +1,2 @@
+
+BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas-rcar-gen3 ${METADIR}/meta-openembedded/meta-multimedia"
diff --git a/recipes-core/images/initramfs-ostree-image.bb b/recipes-core/images/initramfs-ostree-image.bb
index 509b74d..cd872b8 100644
--- a/recipes-core/images/initramfs-ostree-image.bb
+++ b/recipes-core/images/initramfs-ostree-image.bb
@@ -21,6 +21,10 @@ inherit core-image
 
 IMAGE_ROOTFS_SIZE = "8192"
 
+# Users will often ask for extra space in their rootfs by setting this
+# globally.  Since this is a initramfs, we don't want to make it bigger
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
+
 BAD_RECOMMENDATIONS += "busybox-syslog"
 
 
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)} \
               "
diff --git a/recipes-support/python-petname/python-petname.bb b/recipes-support/python-petname/python-petname.bb
index b8a7b88..9abd5d9 100644
--- a/recipes-support/python-petname/python-petname.bb
+++ b/recipes-support/python-petname/python-petname.bb
@@ -13,3 +13,4 @@ RDEPENDS_${PN} = " python-setuptools \
                    python-argparse \
                    "
 
+FILES_${PN} = "${libdir} ${bindir}/petname"
diff --git a/recipes-test/big-update/big-update_1.0.bb b/recipes-test/big-update/big-update_1.0.bb
new file mode 100644
index 0000000..78852a9
--- /dev/null
+++ b/recipes-test/big-update/big-update_1.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Example Package with 10MB of random, seeded content"
+LICENSE = "CLOSED"
+
+SRC_URI = "file://rand_file.py"
+
+FILES_${PN} = "/usr/lib/big-update"
+
+do_install() {
+   install -d ${D}/usr/lib/big-update
+   python ${S}/../rand_file.py ${D}/usr/lib/big-update/a-big-file $(numfmt --from=iec 10M)
+}
diff --git a/recipes-test/big-update/big-update_2.0.bb b/recipes-test/big-update/big-update_2.0.bb
new file mode 100644
index 0000000..6d32557
--- /dev/null
+++ b/recipes-test/big-update/big-update_2.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Example Package with 12MB of random, seeded content"
+LICENSE = "CLOSED"
+
+SRC_URI = "file://rand_file.py"
+
+FILES_${PN} = "/usr/lib/big-update"
+
+do_install() {
+   install -d ${D}/usr/lib/big-update
+   python ${S}/../rand_file.py ${D}/usr/lib/big-update/a-big-file $(numfmt --from=iec 12M)
+}
diff --git a/recipes-test/big-update/files/rand_file.py b/recipes-test/big-update/files/rand_file.py
new file mode 100644
index 0000000..0f4f16e
--- /dev/null
+++ b/recipes-test/big-update/files/rand_file.py
@@ -0,0 +1,16 @@
+import sys
+from random import seed, randint
+
+def main():
+    n = int(sys.argv[2])
+    ba = bytearray(n)
+
+    seed(42)
+    for i in range(0, n):
+       ba[i] = randint(0, 255)
+
+    with open(sys.argv[1], 'wb') as f:
+        f.write(bytes(ba))
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 5adf319..ff78681 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -1,48 +1,35 @@
-#!/bin/sh
+#!/bin/bash
 
 SCRIPT="envsetup.sh"
+MACHINE="$1"
+BUILDDIR="build"
 
-MACHINE=$1
-
-if [ "$#" -lt 1 ]; then
-        echo "Usage: ${SCRIPT} <machine> [builddir]"
-        return -1
-elif [ "$#" -eq 2 ]; then
-        BUILDDIR=$2
-else
-        BUILDDIR=build
-fi
-BULDDIR=$2
+[[ "$#" -lt 1 ]] && { echo "Usage: ${SCRIPT} <machine> [builddir]"; return 1; }
+[[ "$#" -eq 2 ]] && { BUILDDIR="$2"; }
 
 # detect if this script is sourced: see http://stackoverflow.com/a/38128348/6255594
 SOURCED=0
 if [ -n "$ZSH_EVAL_CONTEXT" ]; then
-        [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $0) && pwd -P); }
-elif [ -n "$KSH_VERSION" ]; then
-        [[ "$(cd $(dirname -- $0) && pwd -P)/$(basename -- $0)" != "$(cd $(dirname -- ${.sh.file}) && pwd -P)/$(basename -- ${.sh.file})" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- ${.sh.file}) && pwd -P); }
+  [[ "$ZSH_EVAL_CONTEXT" =~ :file$ ]] && { SOURCED=1; SOURCEDIR=$(cd "$(dirname -- "$0")" && pwd -P); }
 elif [ -n "$BASH_VERSION" ]; then
-        [[ $0 != "$BASH_SOURCE" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $BASH_SOURCE) && pwd -P); }
+  [[ "$0" != "${BASH_SOURCE[0]}" ]] && { SOURCED=1; SOURCEDIR=$(cd "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P); }
 fi
 
-if [ $SOURCED -ne 1 ]; then
-        unset SOURCED
-        unset SOURCEDIR
-    echo "Error: this script needs to be sourced in a supported shell" >&2
-    echo "Please check that the current shell is bash, zsh or ksh and run this script as '. $0 <args>'" >&2
-    exit -1
+if [[ $SOURCED -ne 1 ]]; then
+  echo "Error: this script needs to be sourced in a supported shell" >&2
+  echo "Please check that the current shell is bash or zsh and run this script as '. $0 <args>'" >&2
+  exit 1
 fi
 
-SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) && pwd -P)
-METADIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)
+METADIR="${SOURCEDIR}/../.."
 
-if [ -e ${BUILDDIR}/conf/local.conf ]; then
-        source $METADIR/poky/oe-init-build-env ${BUILDDIR}
+if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
+  source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+  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
+  echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf
+  echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf
 else
-        source $METADIR/poky/oe-init-build-env ${BUILDDIR}
-        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
-        echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf
-        echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf
+  source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
 fi
-