29 files changed, 184 insertions, 393 deletions

diff --git a/README.adoc b/README.adoc
index fbd3239..403e0f8 100644
--- a/README.adoc
+++ b/README.adoc
@@ -44,6 +44,16 @@ and get as a result an "ostree_repo" folder in your images directory (tmp/deploy
 
 Although aglsetup.sh hooks provide reasonable defaults for SOTA-related variables, you may want to tune some of them.
 
+=== Build problems
+
+Multilib systems may require adding this line to `local.conf`:
+
+....
+HOSTTOOLS += "x86_64-linux-gnu-gcc"
+....
+
+Ubuntu users that encounter an error due to missing `Python.h` should install `libpython2.7-dev` on their host machine.
+
 == Supported boards
 
 Currently supported platforms are
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index dcc376d..5ebed81 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -2,7 +2,7 @@
 
 inherit image
 
-IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \
+do_image_ostree[depends] += "ostree-native:do_populate_sysroot \
                         openssl-native:do_populate_sysroot \
                         coreutils-native:do_populate_sysroot \
                         unzip-native:do_populate_sysroot \
@@ -164,7 +164,7 @@ IMAGE_CMD_ostree () {
 }
 
 IMAGE_TYPEDEP_ostreepush = "ostree"
-IMAGE_DEPENDS_ostreepush = "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot "
+do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot"
 IMAGE_CMD_ostreepush () {
     # Print warnings if credetials are not set or if the file has not been found.
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
@@ -182,7 +182,7 @@ IMAGE_CMD_ostreepush () {
 }
 
 IMAGE_TYPEDEP_garagesign = "ostreepush"
-IMAGE_DEPENDS_garagesign = "aktualizr-native:do_populate_sysroot"
+do_image_garage_sign[depends] += "aktualizr-native:do_populate_sysroot"
 IMAGE_CMD_garagesign () {
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         # if credentials are issued by a server that doesn't support offline signing, exit silently
@@ -227,7 +227,7 @@ IMAGE_CMD_garagesign () {
 }
 
 IMAGE_TYPEDEP_garagecheck = "ostreepush garagesign"
-IMAGE_DEPENDS_garagecheck = "aktualizr-native:do_populate_sysroot"
+do_image_garagecheck[depends] += "aktualizr-native:do_populate_sysroot"
 IMAGE_CMD_garagecheck () {
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         # if credentials are issued by a server that doesn't support offline signing, exit silently
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index be9a017..e753e0e 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -11,7 +11,7 @@ inherit image
 
 OSTREE_BOOTLOADER ??= 'u-boot'
 
-IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \
+do_image_otaimg[depends] += "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 ''}"
 
diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass
index 53e0026..666ad6b 100644
--- a/classes/sota_qemux86-64.bbclass
+++ b/classes/sota_qemux86-64.bbclass
@@ -4,7 +4,7 @@ PREFERRED_VERSION_linux-yocto_qemux86-64_sota = "4.4%"
 IMAGE_FSTYPES_remove = "wic"
 
 # U-Boot support for SOTA
-PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota"
+PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot"
 UBOOT_MACHINE_sota = "qemu-x86_defconfig"
 OSTREE_BOOTLOADER ?= "u-boot"
 
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass
index f8e7347..2c69ea0 100644
--- a/classes/sota_raspberrypi.bbclass
+++ b/classes/sota_raspberrypi.bbclass
@@ -1,3 +1,4 @@
+RPI_USE_U_BOOT_sota = "1"
 KERNEL_IMAGETYPE_sota = "uImage"
 PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot"
 UBOOT_MACHINE_raspberrypi2_sota ?= "rpi_2_defconfig"
diff --git a/conf/include/bblayers/sota.inc b/conf/include/bblayers/sota.inc
index 97edecb..26eea22 100644
--- a/conf/include/bblayers/sota.inc
+++ b/conf/include/bblayers/sota.inc
@@ -1,5 +1,3 @@
-
 BBLAYERS += "${METADIR}/meta-updater"
 BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems"
 BBLAYERS += "${METADIR}/meta-openembedded/meta-oe"
-BBLAYERS += "${METADIR}/meta-rust"
diff --git a/conf/include/bblayers/sota_qemux86-64.inc b/conf/include/bblayers/sota_qemux86-64.inc
index 22ace81..12d32ff 100644
--- a/conf/include/bblayers/sota_qemux86-64.inc
+++ b/conf/include/bblayers/sota_qemux86-64.inc
@@ -1,2 +1 @@
-
 BBLAYERS += " ${METADIR}/meta-updater-qemux86-64 " 
diff --git a/conf/include/bblayers/sota_raspberrypi2.inc b/conf/include/bblayers/sota_raspberrypi2.inc
index 11ede20..cc26679 100644
--- a/conf/include/bblayers/sota_raspberrypi2.inc
+++ b/conf/include/bblayers/sota_raspberrypi2.inc
@@ -1,2 +1,3 @@
+BBLAYERS += " ${METADIR}/meta-openembedded/meta-python "
 
 BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " 
diff --git a/conf/include/bblayers/sota_raspberrypi3.inc b/conf/include/bblayers/sota_raspberrypi3.inc
index 11ede20..cc26679 100644
--- a/conf/include/bblayers/sota_raspberrypi3.inc
+++ b/conf/include/bblayers/sota_raspberrypi3.inc
@@ -1,2 +1,3 @@
+BBLAYERS += " ${METADIR}/meta-openembedded/meta-python "
 
 BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " 
diff --git a/lib/oeqa/selftest/cases/qemucommand.py b/lib/oeqa/selftest/cases/qemucommand.py
new file mode 120000
index 0000000..075cdb8
--- /dev/null
+++ b/lib/oeqa/selftest/cases/qemucommand.py
@@ -0,0 +1 @@
+../../../../scripts/qemucommand.py
\ No newline at end of file
diff --git a/lib/oeqa/selftest/updater.py b/lib/oeqa/selftest/cases/updater.py
index f28349f..91ac9fc 100644
--- a/lib/oeqa/selftest/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -1,18 +1,20 @@
-import unittest
+# pylint: disable=C0111,C0325
 import os
 import logging
 import subprocess
-import time
+import unittest
+from time import sleep
 
-from oeqa.selftest.base import oeSelfTest
+from oeqa.selftest.case import OESelftestTestCase
 from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
-from oeqa.selftest.qemucommand import QemuCommand
+from qemucommand import QemuCommand
 
 
-class SotaToolsTests(oeSelfTest):
+class SotaToolsTests(OESelftestTestCase):
 
     @classmethod
     def setUpClass(cls):
+        super(SotaToolsTests, cls).setUpClass()
         logger = logging.getLogger("selftest")
         logger.info('Running bitbake to build aktualizr-native tools')
         bitbake('aktualizr-native')
@@ -38,22 +40,23 @@ class SotaToolsTests(oeSelfTest):
         result = runCmd('%s --help' % p, ignore_status=True)
         self.assertEqual(result.status, 0, "Status not equal to 0. output: %s" % result.output)
 
-class HsmTests(oeSelfTest):
+
+class HsmTests(OESelftestTestCase):
 
     def test_hsm(self):
         self.write_config('SOTA_CLIENT_FEATURES="hsm"')
         bitbake('core-image-minimal')
 
 
-class GeneralTests(oeSelfTest):
+class GeneralTests(OESelftestTestCase):
 
     def test_feature_sota(self):
         result = get_bb_var('DISTRO_FEATURES').find('sota')
-        self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES');
+        self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES')
 
     def test_feature_systemd(self):
         result = get_bb_var('DISTRO_FEATURES').find('systemd')
-        self.assertNotEqual(result, -1, 'Feature "systemd" not set at DISTRO_FEATURES');
+        self.assertNotEqual(result, -1, 'Feature "systemd" not set at DISTRO_FEATURES')
 
     def test_credentials(self):
         bitbake('core-image-minimal')
@@ -66,7 +69,8 @@ class GeneralTests(oeSelfTest):
         deploydir = get_bb_var('DEPLOY_DIR_IMAGE')
         imagename = get_bb_var('IMAGE_LINK_NAME', 'core-image-minimal')
         # Check if the credentials are included in the output image
-        result = runCmd('tar -jtvf %s/%s.tar.bz2 | grep sota_provisioning_credentials.zip' % (deploydir, imagename), ignore_status=True)
+        result = runCmd('tar -jtvf %s/%s.tar.bz2 | grep sota_provisioning_credentials.zip' %
+                        (deploydir, imagename), ignore_status=True)
         self.assertEqual(result.status, 0, "Status not equal to 0. output: %s" % result.output)
 
     def test_java(self):
@@ -99,29 +103,33 @@ class GeneralTests(oeSelfTest):
         self.assertEqual(result.output, 'ERROR: Unable to find any package producing path /usr/bin/man')
         path2 = os.path.realpath(image_path)
         size2 = os.path.getsize(path2)
-        logger.info('Second image %s has size %i' % (path2, size2))
+        logger.info('Second image %s has size %i', path2, size2)
         self.assertNotEqual(path1, path2, "Image paths are identical; image was not rebuilt.")
         self.assertNotEqual(size1, size2, "Image sizes are identical; image was not rebuilt.")
 
 
-class QemuTests(oeSelfTest):
+class QemuTests(OESelftestTestCase):
 
     @classmethod
     def setUpClass(cls):
+        super(QemuTests, cls).setUpClass()
         cls.qemu, cls.s = qemu_launch(machine='qemux86-64')
 
     @classmethod
     def tearDownClass(cls):
         qemu_terminate(cls.s)
 
+    def run_command(self, command):
+        return qemu_send_command(self.qemu.ssh_port, command)
+
     def test_hostname(self):
         print('')
         print('Checking machine name (hostname) of device:')
-        value, err = qemu_send_command(self.qemu.ssh_port, 'hostname')
+        stdout, stderr, retcode = self.run_command('hostname')
         machine = get_bb_var('MACHINE', 'core-image-minimal')
-        self.assertEqual(err, b'', 'Error: ' + err.decode())
+        self.assertEqual(stderr, b'', 'Error: ' + stderr.decode())
         # Strip off line ending.
-        value_str = value.decode()[:-1]
+        value_str = stdout.decode()[:-1]
         self.assertEqual(value_str, machine,
                          'MACHINE does not match hostname: ' + machine + ', ' + value_str)
         print(value_str)
@@ -129,16 +137,34 @@ class QemuTests(oeSelfTest):
     def test_var_sota(self):
         print('')
         print('Checking contents of /var/sota:')
-        value, err = qemu_send_command(self.qemu.ssh_port, 'ls /var/sota')
-        self.assertEqual(err, b'', 'Error: ' + err.decode())
-        print(value.decode())
-
-class GrubTests(oeSelfTest):
+        stdout, stderr, retcode = self.run_command('ls /var/sota')
+        self.assertEqual(stderr, b'', 'Error: ' + stderr.decode())
+        self.assertEqual(retcode, 0)
+        print(stdout.decode())
+
+    def test_aktualizr_info(self):
+        print('Checking output of aktualizr-info:')
+        ran_ok = False
+        for delay in [0, 1, 2, 5, 10, 15]:
+            sleep(delay)
+            try:
+                stdout, stderr, retcode = self.run_command('aktualizr-info')
+                if retcode == 0 and stderr == b'':
+                    ran_ok = True
+                    break
+            except IOError as e:
+                print(e)
+        if not ran_ok:
+            print(stdout.decode())
+            print(stderr.decode())
+
+
+class GrubTests(OESelftestTestCase):
 
     def setUpLocal(self):
         # This is a bit of a hack but I can't see a better option.
         path = os.path.abspath(os.path.dirname(__file__))
-        metadir = path + "/../../../../"
+        metadir = path + "/../../../../../"
         grub_config = 'OSTREE_BOOTLOADER = "grub"\nMACHINE = "intel-corei7-64"'
         self.append_config(grub_config)
         self.meta_intel = metadir + "meta-intel"
@@ -155,13 +181,15 @@ class GrubTests(oeSelfTest):
     def test_grub(self):
         print('')
         print('Checking machine name (hostname) of device:')
-        value, err = qemu_send_command(self.qemu.ssh_port, 'hostname')
+        value, err, retcode = qemu_send_command(self.qemu.ssh_port, 'hostname')
         machine = get_bb_var('MACHINE', 'core-image-minimal')
         self.assertEqual(err, b'', 'Error: ' + err.decode())
+        self.assertEqual(retcode, 0)
         # Strip off line ending.
         value_str = value.decode()[:-1]
         self.assertEqual(value_str, machine,
-                         'MACHINE does not match hostname: ' + machine + ', ' + value_str)
+                         'MACHINE does not match hostname: ' + machine + ', ' + value_str +
+                         '\nIs tianocore ovmf installed?')
         print(value_str)
 
 
@@ -189,7 +217,7 @@ def qemu_launch(efi=False, machine=None):
     cmdline = qemu.command_line()
     print('Booting image with run-qemu-ota...')
     s = subprocess.Popen(cmdline)
-    time.sleep(10)
+    sleep(10)
     return qemu, s
 
 def qemu_terminate(s):
@@ -202,6 +230,7 @@ def qemu_send_command(port, command):
     command = ['ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@localhost -p ' +
                str(port) + ' "' + command + '"']
     s2 = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    value, err = s2.communicate()
-    return value, err
+    stdout, stderr = s2.communicate()
+    return stdout, stderr, s2.returncode
 
+# vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/lib/oeqa/selftest/qemucommand.py b/lib/oeqa/selftest/qemucommand.py
deleted file mode 120000
index bc06dde..0000000
--- a/lib/oeqa/selftest/qemucommand.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../scripts/qemucommand.py
\ No newline at end of file
diff --git a/recipes-bsp/u-boot/u-boot_2016.11.bb b/recipes-bsp/u-boot/u-boot_2016.11.bb
deleted file mode 100644
index acd4bb8..0000000
--- a/recipes-bsp/u-boot/u-boot_2016.11.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-
-HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
-SECTION = "bootloaders"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-PE = "1"
-
-DEPENDS += "dtc-native"
-
-SRCREV = "5ea3e51fc481613a8dee8c02848d1b42c81ad892"
-SRC_URI = "git://git.denx.de/u-boot.git"
-S = "${WORKDIR}/git"
-
-PV = "v2016.11+git${SRCPV}"
-
-#This patch is not compliant with u-boot 2016.11
-#Version of u-boot from yocto 2.2 Morty is 2016.03 from:
-# meta/recipes-bsp/u-boot/u-boot_2016.03.bb
-SRC_URI_remove_raspberrypi3 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch"
-SRC_URI_remove_raspberrypi2 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch"
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 67ec104..495162e 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -5,7 +5,7 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "boost curl openssl libarchive libsodium "
+DEPENDS = "boost curl openssl libarchive libsodium asn1c-native "
 DEPENDS_append_class-target = "jansson ostree ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' libp11', '', d)} "
 DEPENDS_append_class-native = "glib-2.0-native "
 
diff --git a/recipes-sota/asn1c/asn1c.bb b/recipes-sota/asn1c/asn1c.bb
new file mode 100644
index 0000000..9d1517d
--- /dev/null
+++ b/recipes-sota/asn1c/asn1c.bb
@@ -0,0 +1,17 @@
+SUMMARY = "ASN.1 to C compiler"
+DESCRIPTION = "Generates serialization routines from ASN.1 schemas"
+HOMEPAGE = "http://lionet.info/asn1c"
+SECTION = "base"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ee8bfaaa7d71cf3edb079475e6716d4b"
+
+inherit autotools native
+
+PV = "0.9.28"
+SRC_URI = "https://github.com/vlm/asn1c/releases/download/v${PV}/asn1c-${PV}.tar.gz \
+           file://skeletons_dir_fix.patch"
+SRC_URI[sha256sum] = "8007440b647ef2dd9fb73d931c33ac11764e6afb2437dbe638bb4e5fc82386b9"
+
+BBCLASSEXTEND = "native nativesdk"
+
+# vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-sota/asn1c/files/skeletons_dir_fix.patch b/recipes-sota/asn1c/files/skeletons_dir_fix.patch
new file mode 100644
index 0000000..f1caa2f
--- /dev/null
+++ b/recipes-sota/asn1c/files/skeletons_dir_fix.patch
@@ -0,0 +1,44 @@
+From 1a1c2c94f700cf0f4dc5dba863950b16477fdc6d Mon Sep 17 00:00:00 2001
+From: Laurent Bonnans <laurent.bonnans@here.com>
+Date: Thu, 25 Jan 2018 09:49:41 +0100
+Subject: [PATCH] Patch the skeletons directory detection
+
+Detect `share/asn1c` from `bin/` if it exists
+---
+ asn1c/asn1c.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/asn1c/asn1c.c b/asn1c/asn1c.c
+index eb1eff7c..dd9fc832 100644
+--- a/asn1c/asn1c.c
++++ b/asn1c/asn1c.c
+@@ -226,22 +226,21 @@ main(int ac, char **av) {
+     if(skeletons_dir == NULL) {
+         struct stat sb;
+         skeletons_dir = DATADIR;
+-        if((av[-optind][0] == '.' || av[-optind][1] == '/')
+-           && stat(skeletons_dir, &sb)) {
++        if(stat(skeletons_dir, &sb)) {
+             /*
+              * The default skeletons directory does not exist,
+              * compute it from my file name:
+-             * ./asn1c/asn1c -> ./skeletons
++             * ./asn1c/asn1c -> ./share/asn1c
+              */
+             char *p;
+             size_t len;
+ 
+             p = a1c_dirname(av[-optind]);
+ 
+-            len = strlen(p) + sizeof("/../skeletons");
++            len = strlen(p) + sizeof("/../share/asn1c");
+             skeletons_dir = malloc(len);
+             assert(skeletons_dir);
+-            snprintf(skeletons_dir, len, "%s/../skeletons", p);
++            snprintf(skeletons_dir, len, "%s/../share/asn1c", p);
+             if(stat(skeletons_dir, &sb)) {
+                 fprintf(stderr,
+                         "WARNING: skeletons are neither in "
+-- 
+2.15.1
+
diff --git a/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service b/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service
deleted file mode 100644
index 11b1354..0000000
--- a/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=SOTA Client Autoprovisioning
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-Type=oneshot
-WorkingDirectory=/var/sota
-Environment=SOTA_CERT_DIR=/var/sota
-ExecStart=/usr/bin/sota_provision.sh sota_provisioning_credentials
-RemainAfterExit=true
-StandardOutput=journal
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-sota/rvi-sota-client/files/sota-client-ostree.service b/recipes-sota/rvi-sota-client/files/sota-client-ostree.service
deleted file mode 100644
index 093a994..0000000
--- a/recipes-sota/rvi-sota-client/files/sota-client-ostree.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=SOTA Client
-Requires=network-online.target
-After=network.target network-online.target
-
-[Service]
-RestartSec=5
-Restart=on-failure
-Environment="RUST_LOG=debug"
-ExecStart=/usr/bin/sota_client --config /sysroot/boot/sota.toml --device-package-manager ostree
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-sota/rvi-sota-client/files/sota-client-uptane.service b/recipes-sota/rvi-sota-client/files/sota-client-uptane.service
deleted file mode 100644
index a2d80ce..0000000
--- a/recipes-sota/rvi-sota-client/files/sota-client-uptane.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=SOTA Client
-Requires=network-online.target
-After=network.target network-online.target
-Requires=sota-client-autoprovision
-After=sota-client-autoprovision
-
-[Service]
-RestartSec=5
-Restart=on-failure
-Environment="RUST_LOG=debug"
-ExecStart=/usr/bin/sota_client --config /var/sota/sota.toml --device-package-manager uptane
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-sota/rvi-sota-client/files/sota-installer.service b/recipes-sota/rvi-sota-client/files/sota-installer.service
deleted file mode 100644
index a4fd99e..0000000
--- a/recipes-sota/rvi-sota-client/files/sota-installer.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100644
index 712b9b3..0000000
--- a/recipes-sota/rvi-sota-client/rvi-sota-client.inc
+++ /dev/null
@@ -1,173 +0,0 @@
-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 = "be8ec83af2051a2b2499ce8878242771c65f0f1c"
-
-PR = "1"
-
-# generate with: `make package-version`
-PV = "0.2.34-8-gbe8ec83"
-
-# 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/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.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.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.3.1 \
-crate://crates.io/chrono/0.4.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.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.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/fake-simd/0.1.2 \
-crate://crates.io/filetime/0.1.14 \
-crate://crates.io/foreign-types/0.2.0 \
-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.13 \
-crate://crates.io/hyper-native-tls/0.2.4 \
-crate://crates.io/idna/0.1.4 \
-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.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.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.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.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.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.12.1 \
-crate://crates.io/rust-crypto/0.2.36 \
-crate://crates.io/rustc-demangle/0.1.5 \
-crate://crates.io/rustc-serialize/0.3.24 \
-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.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/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.5 \
-crate://crates.io/traitobject/0.1.0 \
-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.4 \
-crate://crates.io/unicode-normalization/0.1.5 \
-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.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 \
-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
deleted file mode 100644
index e286598..0000000
--- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-require rvi-sota-client.inc
-
-
-SYSTEMD_SERVICE_${PN} = "sota-client.service sota-client-autoprovision.service"
-
-FILES_${PN} = " \
-/lib64 \
-${bindir}/sota_client \
-${bindir}/sota_sysinfo.sh \
-${bindir}/sota_provision.sh \
-${sysconfdir}/sota_client.version \
-${sysconfdir}/sota_certificates \
-${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota-client.service', '', d)} \
-${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota-client-autoprovision.service', '', d)} \
-"
-
-DEPENDS += " openssl openssl-native dbus "
-RDEPENDS_${PN} = " \
-bash \
-curl \
-libcrypto \
-libssl \
-lshw \
-jq \
-python-petname \
-sota-launcher \
-zip \
-"
-
-export SOTA_PACKED_CREDENTIALS
-
-do_compile_prepend() {
-  export SOTA_VERSION=$(make sota-version)
-  cd sota-client
-}
-
-do_install() {
-  ln -fs /lib ${D}/lib64
-
-  install -d ${D}${bindir}
-  install -d ${D}${sysconfdir}
-
-  echo `git log -1 --pretty=format:%H` > ${D}${sysconfdir}/sota_client.version
-  install -c ${S}/sota-client/docker/sota_certificates ${D}${sysconfdir}
-
-  install -m 0755 target/${TARGET_SYS}/release/sota_client ${D}${bindir}
-  install -m 0755 ${S}/sota-client/docker/sota_provision.sh ${D}${bindir}
-  install -m 0755 ${S}/sota-client/docker/sota_sysinfo.sh ${D}${bindir}
-
-  if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-    install -d ${D}/${systemd_unitdir}/system
-    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
-    fi
-    install -m 0644 ${WORKDIR}/sota-client-autoprovision.service ${D}/${systemd_unitdir}/system/sota-client-autoprovision.service
-  fi
-}
diff --git a/recipes-sota/rvi-sota-client/sota-installer_git.bb b/recipes-sota/rvi-sota-client/sota-installer_git.bb
deleted file mode 100644
index 09f6e5d..0000000
--- a/recipes-sota/rvi-sota-client/sota-installer_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index e9874e7..0000000
--- a/recipes-sota/rvi-sota-client/sota-launcher_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-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-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
new file mode 100644
index 0000000..0538eff
--- /dev/null
+++ b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
@@ -0,0 +1,42 @@
+From ccab5ce63dd5d3dbb4bd02998d21d34407e550f2 Mon Sep 17 00:00:00 2001
+From: Anton Gerasimov <anton.gerasimov@here.com>
+Date: Fri, 19 Jan 2018 12:44:27 +0100
+Subject: [PATCH] Workaround for a buggy version of openssl (1.0.2m)
+
+---
+ src/p11_pkey.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/p11_pkey.c b/src/p11_pkey.c
+index 45d5ad3..75625e6 100644
+--- a/src/p11_pkey.c
++++ b/src/p11_pkey.c
+@@ -139,8 +139,14 @@ static void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src)
+ 
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x100020d0L || defined(LIBRESSL_VERSION_NUMBER)
+-static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
++#if OPENSSL_VERSION_NUMBER <= 0x100020e0L || defined(LIBRESSL_VERSION_NUMBER)
++
++#  if (OPENSSL_VERSION_NUMBER & 0xFFFFFFF0) == 0x100020d0L
++#    undef EVP_PKEY_meth_get_sign
++#    undef EVP_PKEY_meth_get_decrypt
++#  endif
++
++void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
+                int (**psign_init) (EVP_PKEY_CTX *ctx),
+                int (**psign) (EVP_PKEY_CTX *ctx,
+                        unsigned char *sig, size_t *siglen,
+@@ -152,7 +158,7 @@ static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
+                *psign = pmeth->sign;
+ }
+ 
+-static void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
++void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
+                int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
+                int (**pdecrypt) (EVP_PKEY_CTX *ctx,
+                        unsigned char *out,
+-- 
+2.15.1
+
diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb
index 7d77e90..7a93102 100644
--- a/recipes-support/libp11/libp11_0.4.7.bb
+++ b/recipes-support/libp11/libp11_0.4.7.bb
@@ -8,7 +8,8 @@ LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
 DEPENDS = "libtool openssl"
 
-SRC_URI = "git://github.com/OpenSC/libp11.git"
+SRC_URI = "git://github.com/OpenSC/libp11.git \
+           file://0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch"
 SRCREV = "da725ab727342083478150a203a3c80c4551feb4"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-support/util-linux/util-linux_%.bbappend b/recipes-support/util-linux/util-linux_%.bbappend
deleted file mode 100644
index d653bb2..0000000
--- a/recipes-support/util-linux/util-linux_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-PACKAGES_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' util-linux-agetty-native util-linux-fdisk-native util-linux-cfdisk-native util-linux-sfdisk-native util-linux-swaponoff-native util-linux-losetup-native util-linux-umount-native util-linux-mount-native util-linux-readprofile-native util-linux-uuidd-native util-linux-uuidgen-native util-linux-lscpu-native util-linux-fsck-native util-linux-blkid util-linux-mkfs-native util-linux-mcookie-native util-linux-reset-native util-linux-mkfs.cramfs-native util-linux-fsck.cramfs-native util-linux-fstrim-native util-linux-partx-native ${PN}-bash-completion-native util-linux-hwclock util-linux-findfs-native util-linux-getopt-native util-linux-sulogin-native', ' ', d)}"
-
-PACKAGES_append_class-native = "${@' util-linux-pylibmount-native' if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d) and bb.utils.contains('PACKAGECONFIG', 'pylibmount', True, False, d) else ' '}"
diff --git a/scripts/lib/wic/plugins/source/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py
index 26cfb10..ee8088b 100644
--- a/scripts/lib/wic/plugins/source/otaimage.py
+++ b/scripts/lib/wic/plugins/source/otaimage.py
@@ -20,7 +20,7 @@ import os
 import sys
 
 from wic.plugins.source.rawcopy import RawCopyPlugin
-from wic.utils.misc import get_bitbake_var
+from wic.misc import get_bitbake_var
 
 logger = logging.getLogger('wic')
 
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index 9a893d8..6b1106d 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -73,7 +73,7 @@ class QemuCommand(object):
             try:
                 check_output(['kvm-ok'])
                 self.kvm = True
-            except CalledProcessError:
+            except Exception:
                 self.kvm = False
         else:
             self.kvm = args.kvm
@@ -96,7 +96,7 @@ class QemuCommand(object):
             "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port,
             "-m", "1G",
             "-usb",
-            "-usbdevice", "tablet",
+            "-device", "usb-tablet",
             "-show-cursor",
             "-vga", "std",
             "-net", netuser,