15 files changed, 308 insertions, 88 deletions

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index df7a717..93a0815 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -1,4 +1,5 @@
 = Contributing
 
-We welcome pull requests from everyone. It may be helpful to read the README and other documentation for link:README.adoc[this repo], https://github.com/advancedtelematic/aktualizr[aktualizr], and the https://github.com/advancedtelematic/updater-repo/[updater-repo], particularly the sections and development and debugging.
+We welcome pull requests from anyone. The master branch is the primary branch for development, and if you wish to add new functionality, it probably belongs there. We attempt to maintain recent previous branches and welcome bug fixes and backports for those. Currently, the actively maintained branches are sumo, rocko, and pyro. Previously, morty was also a stable branch, but it has not been updated or actively maintained for a while.
 
+If you are developing with meta-updater, it may be helpful to read the README and other documentation for link:README.adoc[this repo], https://github.com/advancedtelematic/aktualizr[aktualizr], and the https://github.com/advancedtelematic/updater-repo/[updater-repo], particularly the sections about development and debugging.
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 6aacc52..ca8aee3 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -159,7 +159,7 @@ IMAGE_CMD_ostreepush () {
     # Print warnings if credetials are not set or if the file has not been found.
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then
-            garage-push --repo=${OSTREE_REPO} \
+            garage-push -vv --repo=${OSTREE_REPO} \
                         --ref=${OSTREE_BRANCHNAME} \
                         --credentials=${SOTA_PACKED_CREDENTIALS} \
                         --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index 38d4ce5..e1c5ecd 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -24,7 +24,6 @@ OSTREE_INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', T
 
 # Please redefine OSTREE_REPO in order to have a persistent OSTree repo
 OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
-# For UPTANE operation, OSTREE_BRANCHNAME must start with "${MACHINE}-"
 OSTREE_BRANCHNAME ?= "${MACHINE}"
 OSTREE_OSNAME ?= "poky"
 OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 0253a84..e620491 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -115,8 +115,8 @@ class AktualizrToolsTests(OESelftestTestCase):
         bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS', 'T'], 'aktualizr-native')
         creds = bb_vars['SOTA_PACKED_CREDENTIALS']
         temp_dir = bb_vars['T']
-        bb_vars_prov = get_bb_vars(['STAGING_DIR_NATIVE', 'libdir'], 'aktualizr-implicit-prov')
-        config = bb_vars_prov['STAGING_DIR_NATIVE'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov.toml'
+        bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-implicit-prov')
+        config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov.toml'
 
         akt_native_run(self, 'aktualizr_cert_provider -c {creds} -r -l {temp} -g {config}'
                        .format(creds=creds, temp=temp_dir, config=config))
@@ -141,7 +141,7 @@ class AutoProvTests(OESelftestTestCase):
         if re.search(layer, result.output) is None:
             # Assume the directory layout for finding other layers. We could also
             # make assumptions by using 'show-layers', but either way, if the
-            # layers we need aren't where we expect them, we are out of like.
+            # layers we need aren't where we expect them, we are out of luck.
             path = os.path.abspath(os.path.dirname(__file__))
             metadir = path + "/../../../../../"
             self.meta_qemu = metadir + layer
@@ -193,6 +193,49 @@ class AutoProvTests(OESelftestTestCase):
                       'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode())
 
 
+class ManualControlTests(OESelftestTestCase):
+
+    def setUpLocal(self):
+        layer = "meta-updater-qemux86-64"
+        result = runCmd('bitbake-layers show-layers')
+        if re.search(layer, result.output) is None:
+            # Assume the directory layout for finding other layers. We could also
+            # make assumptions by using 'show-layers', but either way, if the
+            # layers we need aren't where we expect them, we are out of like.
+            path = os.path.abspath(os.path.dirname(__file__))
+            metadir = path + "/../../../../../"
+            self.meta_qemu = metadir + layer
+            runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu)
+        else:
+            self.meta_qemu = None
+        self.append_config('MACHINE = "qemux86-64"')
+        self.append_config('SOTA_CLIENT_PROV = " aktualizr-auto-prov "')
+        self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"')
+        self.qemu, self.s = qemu_launch(machine='qemux86-64')
+
+    def tearDownLocal(self):
+        qemu_terminate(self.s)
+        if self.meta_qemu:
+            runCmd('bitbake-layers remove-layer "%s"' % self.meta_qemu, ignore_status=True)
+
+    def qemu_command(self, command):
+        return qemu_send_command(self.qemu.ssh_port, command)
+
+    def test_manual_running_mode_once(self):
+        """
+        Disable the systemd service then run aktualizr manually
+        """
+        sleep(20)
+        stdout, stderr, retcode = self.qemu_command('aktualizr-info')
+        self.assertIn(b'Fetched metadata: no', stdout,
+                      'Aktualizr should not have run yet' + stderr.decode() + stdout.decode())
+
+        stdout, stderr, retcode = self.qemu_command('aktualizr --running-mode=once')
+
+        stdout, stderr, retcode = self.qemu_command('aktualizr-info')
+        self.assertIn(b'Fetched metadata: yes', stdout,
+                      'Aktualizr should have run' + stderr.decode() + stdout.decode())
+
 class RpiTests(OESelftestTestCase):
 
     def setUpLocal(self):
@@ -204,7 +247,7 @@ class RpiTests(OESelftestTestCase):
         result = runCmd('bitbake-layers show-layers')
         # Assume the directory layout for finding other layers. We could also
         # make assumptions by using 'show-layers', but either way, if the
-        # layers we need aren't where we expect them, we are out of like.
+        # layers we need aren't where we expect them, we are out of luck.
         path = os.path.abspath(os.path.dirname(__file__))
         metadir = path + "/../../../../../"
         if re.search(layer_python, result.output) is None:
@@ -277,7 +320,7 @@ class GrubTests(OESelftestTestCase):
         result = runCmd('bitbake-layers show-layers')
         # Assume the directory layout for finding other layers. We could also
         # make assumptions by using 'show-layers', but either way, if the
-        # layers we need aren't where we expect them, we are out of like.
+        # layers we need aren't where we expect them, we are out of luck.
         path = os.path.abspath(os.path.dirname(__file__))
         metadir = path + "/../../../../../"
         if re.search(layer_intel, result.output) is None:
@@ -339,7 +382,7 @@ class ImplProvTests(OESelftestTestCase):
         if re.search(layer, result.output) is None:
             # Assume the directory layout for finding other layers. We could also
             # make assumptions by using 'show-layers', but either way, if the
-            # layers we need aren't where we expect them, we are out of like.
+            # layers we need aren't where we expect them, we are out of luck.
             path = os.path.abspath(os.path.dirname(__file__))
             metadir = path + "/../../../../../"
             self.meta_qemu = metadir + layer
@@ -348,6 +391,7 @@ class ImplProvTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-implicit-prov "')
+        runCmd('bitbake -c cleanall aktualizr aktualizr-implicit-prov')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
@@ -392,8 +436,8 @@ class ImplProvTests(OESelftestTestCase):
         # Run cert_provider.
         bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native')
         creds = bb_vars['SOTA_PACKED_CREDENTIALS']
-        bb_vars_prov = get_bb_vars(['STAGING_DIR_NATIVE', 'libdir'], 'aktualizr-implicit-prov')
-        config = bb_vars_prov['STAGING_DIR_NATIVE'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov.toml'
+        bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-implicit-prov')
+        config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov.toml'
 
         akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -s -g {config}'
                        .format(creds=creds, port=self.qemu.ssh_port, config=config))
@@ -409,7 +453,7 @@ class HsmTests(OESelftestTestCase):
         if re.search(layer, result.output) is None:
             # Assume the directory layout for finding other layers. We could also
             # make assumptions by using 'show-layers', but either way, if the
-            # layers we need aren't where we expect them, we are out of like.
+            # layers we need aren't where we expect them, we are out of luck.
             path = os.path.abspath(os.path.dirname(__file__))
             metadir = path + "/../../../../../"
             self.meta_qemu = metadir + layer
@@ -419,6 +463,7 @@ class HsmTests(OESelftestTestCase):
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = "aktualizr-hsm-prov"')
         self.append_config('SOTA_CLIENT_FEATURES = "hsm"')
+        runCmd('bitbake -c cleanall aktualizr aktualizr-hsm-prov')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
@@ -473,8 +518,8 @@ class HsmTests(OESelftestTestCase):
         # Run cert_provider.
         bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native')
         creds = bb_vars['SOTA_PACKED_CREDENTIALS']
-        bb_vars_prov = get_bb_vars(['STAGING_DIR_NATIVE', 'libdir'], 'aktualizr-hsm-prov')
-        config = bb_vars_prov['STAGING_DIR_NATIVE'] + bb_vars_prov['libdir'] + '/sota/sota_hsm_prov.toml'
+        bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-hsm-prov')
+        config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_hsm_prov.toml'
 
         akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -r -s -g {config}'
                        .format(creds=creds, port=self.qemu.ssh_port, config=config))
@@ -527,7 +572,7 @@ class SecondaryTests(OESelftestTestCase):
         if re.search(layer, result.output) is None:
             # Assume the directory layout for finding other layers. We could also
             # make assumptions by using 'show-layers', but either way, if the
-            # layers we need aren't where we expect them, we are out of like.
+            # layers we need aren't where we expect them, we are out of luck.
             path = os.path.abspath(os.path.dirname(__file__))
             metadir = path + "/../../../../../"
             self.meta_qemu = metadir + layer
@@ -554,7 +599,7 @@ class SecondaryTests(OESelftestTestCase):
 
     def test_secondary_listening(self):
         print('Checking aktualizr-secondary service is listening')
-        stdout, stderr, retcode = self.qemu_command('echo test | nc localhost 9030')
+        stdout, stderr, retcode = self.qemu_command('aktualizr-check-discovery')
         self.assertEqual(retcode, 0, "Unable to connect to secondary")
 
 
@@ -572,7 +617,7 @@ class PrimaryTests(OESelftestTestCase):
         if re.search(layer, result.output) is None:
             # Assume the directory layout for finding other layers. We could also
             # make assumptions by using 'show-layers', but either way, if the
-            # layers we need aren't where we expect them, we are out of like.
+            # layers we need aren't where we expect them, we are out of luck.
             path = os.path.abspath(os.path.dirname(__file__))
             metadir = path + "/../../../../../"
             self.meta_qemu = metadir + layer
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
index 7f4f2e4..77f8f22 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
@@ -36,7 +36,7 @@ do_install() {
         aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)}
 
         install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \
-            ${D}${libdir}/sota/conf.d/20-${aktualizr_toml}.toml
+            ${D}${libdir}/sota/conf.d/20-${aktualizr_toml}
 
         # deploy SOTA credentials
         if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then
@@ -49,7 +49,7 @@ do_install() {
 
 FILES_${PN} = " \
                 ${libdir}/sota/conf.d \
-                ${libdir}/sota/conf.d/20-${aktualizr_toml}.toml \
+                ${libdir}/sota/conf.d/20-${aktualizr_toml} \
                 ${localstatedir}/sota \
                 ${localstatedir}/sota/sota_provisioning_credentials.zip \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
index 4d5ff79..e00d41a 100644
--- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
@@ -9,8 +9,7 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "aktualizr-native openssl-native"
-RDEPENDS_${PN} = "aktualizr"
+DEPENDS = "aktualizr aktualizr-native openssl-native"
 
 SRC_URI = " \
   file://LICENSE \
@@ -52,7 +51,7 @@ do_install() {
     fi
 
     install -m 0700 -d ${D}${localstatedir}/sota
-    install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov_ca.toml \
+    install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota_implicit_prov_ca.toml \
         ${D}${libdir}/sota/conf.d/20-sota_implicit_prov_ca.toml
     aktualizr_cert_provider --credentials ${SOTA_PACKED_CREDENTIALS} \
                             --device-ca ${SOTA_CACERT_PATH} \
@@ -60,7 +59,7 @@ do_install() {
                             --root-ca \
                             --server-url \
                             --local ${D}${localstatedir}/sota \
-                            --config ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov_ca.toml
+                            --config ${STAGING_DIR_HOST}${libdir}/sota/sota_implicit_prov_ca.toml
 }
 
 FILES_${PN} = " \
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
index d526cd2..ce92e9c 100644
--- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
@@ -5,8 +5,7 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "aktualizr-native"
-RDEPENDS_${PN} = "aktualizr"
+DEPENDS = "aktualizr aktualizr-native"
 
 SRC_URI = " \
   file://LICENSE \
@@ -19,11 +18,10 @@ require credentials.inc
 
 do_install() {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
-    install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \
+    install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota_hsm_prov.toml \
         ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \
-            -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \
             -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D}
     fi
 }
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
index e08eeef..6e5f338 100644
--- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
@@ -5,8 +5,7 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "aktualizr-native"
-RDEPENDS_${PN} = "aktualizr"
+DEPENDS = "aktualizr aktualizr-native"
 
 SRC_URI = " \
   file://LICENSE \
@@ -19,11 +18,10 @@ require credentials.inc
 
 do_install() {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
-    install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml \
+    install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota_implicit_prov.toml \
         ${D}${libdir}/sota/conf.d/20-sota_implicit_prov.toml
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \
-            -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml \
             -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D}
     fi
 }
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 8dc4b31..3684372 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -13,6 +13,9 @@ RDEPENDS_${PN}_class-target = "lshw "
 RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} "
 RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' softhsm softhsm-testtoken', '', d)}"
 
+RDEPENDS_${PN}_append_class-target = " ${PN}-tools "
+RDEPENDS_${PN}-secondary_append_class-target = " ${PN}-tools "
+
 PV = "1.0+git${SRCPV}"
 PR = "7"
 
@@ -23,7 +26,7 @@ SRC_URI = " \
   file://aktualizr-secondary.socket \
   file://aktualizr-serialcan.service \
   "
-SRCREV = "114dc6c519ca9a605d73ad292821348607d0fa12"
+SRCREV = "41ffd4a967a15f9b4638573cda12bd9d4c260626"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
@@ -81,7 +84,7 @@ do_install_append_class-native () {
     install -m 0644 ${B}/src/sota_tools/garage-sign/lib/* ${D}${libdir}
 }
 
-PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-secondary "
+PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-tools ${PN}-secondary "
 
 FILES_${PN} = " \
                 ${bindir}/aktualizr \
@@ -111,6 +114,10 @@ FILES_${PN}-host-tools = " \
                 ${libdir}/sota/sota_implicit_prov_ca.toml \
                 "
 
+FILES_${PN}-tools = " \
+                ${bindir}/aktualizr-check-discovery \
+                "
+
 FILES_${PN}-secondary = " \
                 ${bindir}/aktualizr-secondary \
                 ${libdir}/sota/sota_secondary.toml \
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index afb767f..6fa6ad4 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/recipes-sota/ostree/ostree_git.bb
@@ -1,10 +1,9 @@
 SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees"
-LICENSE = "GPLv2+"
+HOMEPAGE = "https://ostree.readthedocs.io/en/latest/"
+LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-inherit autotools pkgconfig systemd gobject-introspection
-
-INHERIT_remove_class-native = "systemd"
+inherit autotools pkgconfig systemd bash-completion gobject-introspection
 
 SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master"
 
@@ -17,76 +16,54 @@ S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"
 
-DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse e2fsprogs gtk-doc-native curl xz"
-DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
-DEPENDS_remove_class-native = "systemd-native"
-
-RDEPENDS_${PN} = "util-linux-libuuid util-linux-libblkid util-linux-libmount libcap bash"
+DEPENDS += "attr libarchive libcap glib-2.0 gpgme libgsystem fuse e2fsprogs curl xz"
+DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+RDEPENDS_${PN}-dracut = "bash"
 
-EXTRA_OECONF = "CFLAGS='-Wno-error=missing-prototypes' --with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man --with-smack --with-builtin-grub2-mkconfig --with-curl --without-soup"
+CFLAGS_append = " -Wno-error=missing-prototypes"
+EXTRA_OECONF = "--disable-gtk-doc --disable-man --with-smack --with-builtin-grub2-mkconfig --with-curl --without-soup"
 EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat"
 
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-dracut"
+
 # 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 = ""
-
 SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service"
-SYSTEMD_SERVICE_${PN}_class-native = ""
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-PACKAGECONFIG_class-native = ""
-PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-dracut"
-
-FILES_${PN} += "${libdir}/ostree/ ${libdir}/ostbuild"
 
+export BUILD_SYS
+export HOST_SYS
 export STAGING_INCDIR
 export STAGING_LIBDIR
 
-do_configure() {
- unset docdir
- NOCONFIGURE=1 "${S}/autogen.sh"
- oe_runconf
-}
-
-do_compile_prepend() {
- export BUILD_SYS="${BUILD_SYS}"
- export HOST_SYS="${HOST_SYS}"
-}
-
-export SYSTEMD_REQUIRED
-
-do_install_append() {
- if [ -n ${SYSTEMD_REQUIRED} ]; then
-  install -m 0644 -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service
-  install -m 0644 -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service
- fi
+do_configure_prepend() {
+    unset docdir
+    NOCONFIGURE=1 "${S}/autogen.sh"
 }
 
 do_install_append_class-native() {
-        create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator"
+    create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator"
 }
 
-
-FILES_${PN} += " \
-    ${@'${systemd_unitdir}/system/' if d.getVar('SYSTEMD_REQUIRED', True) else ''} \
-    ${@'${libdir}/dracut/modules.d/98ostree/module-setup.sh' if d.getVar('SYSTEMD_REQUIRED', True) else ''} \
-    ${datadir}/gir-1.0 \
-    ${datadir}/gir-1.0/OSTree-1.0.gir \
-    ${libdir}/girepository-1.0 \
-    ${libdir}/girepository-1.0/OSTree-1.0.typelib \
-    ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \
-    ${datadir}/bash-completion/completions/ostree \
-    ${systemd_unitdir}/system-generators/ostree-system-generator \
+PACKAGES += " \
+    ${PN}-switchroot \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'ostree-dracut', '', d)} \
 "
 
-PACKAGES =+ "${PN}-switchroot"
-
+FILES_${PN} = "${bindir} \
+    ${sysconfdir}/ostree \
+    ${datadir}/ostree \
+    ${libdir}/*.so.* \
+    ${libdir}/ostree/ostree-grub-generator \
+    ${libdir}/ostree/ostree-remount \
+    ${libdir}/girepository-1.0/* \
+    ${@bb.utils.contains('DISTRO_FEATURES','systemd','${libdir}/tmpfiles.d', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system-generators', '', d)} \
+"
+FILES_${PN}-dev += " ${datadir}/gir-1.0"
+FILES_${PN}-dracut = "${sysconfdir}/dracut.conf.d ${libdir}/dracut"
 FILES_${PN}-switchroot = "${libdir}/ostree/ostree-prepare-root"
-RDEPENDS_${PN}-switchroot = ""
-DEPENDS_remove_class-native = "systemd-native"
-
diff --git a/scripts/ci/Dockerfile.bitbake b/scripts/ci/Dockerfile.bitbake
new file mode 100644
index 0000000..4dfafec
--- /dev/null
+++ b/scripts/ci/Dockerfile.bitbake
@@ -0,0 +1,36 @@
+FROM debian:stable
+LABEL Description="Image for bitbaking"
+
+RUN sed -i 's#deb http://deb.debian.org/debian stable main#deb http://deb.debian.org/debian stable main contrib#g' /etc/apt/sources.list
+RUN sed -i 's#deb http://deb.debian.org/debian stable-updates main#deb http://deb.debian.org/debian stable-updates main contrib#g' /etc/apt/sources.list
+RUN apt-get update -q && apt-get install -qy \
+     build-essential \
+     bzip2 \
+     chrpath \
+     cpio \
+     default-jre \
+     diffstat \
+     gawk \
+     gcc-multilib \
+     git-core \
+     iputils-ping \
+     iproute \
+     libpython-dev \
+     libsdl1.2-dev \
+     locales \
+     procps \
+     python \
+     python3 \
+     python3-pexpect \
+     qemu \
+     socat \
+     texinfo \
+     unzip \
+     wget \
+     xterm \
+     xz-utils
+
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
+ENV LC_ALL="en_US.UTF-8"
+ENV LANG="en_US.UTF-8"
+ENV LANGUAGE="en_US.UTF-8"
diff --git a/scripts/ci/Jenkinsfile.bleeding b/scripts/ci/Jenkinsfile.bleeding
new file mode 100644
index 0000000..6d0f1e7
--- /dev/null
+++ b/scripts/ci/Jenkinsfile.bleeding
@@ -0,0 +1,74 @@
+// This CI setup checks out aktualizr, meta-updater and updater-repo and builds
+// master branches whenever a change is pushed to any of these
+
+pipeline {
+  agent none
+  environment {
+    TEST_AKTUALIZR_REMOTE = 'aktualizr'
+    TEST_AKTUALIZR_DIR = 'aktualizr'
+    TEST_AKTUALIZR_BRANCH = 'master'
+    TEST_BITBAKE_COMMON_DIR = "/opt/jenkins/bitbake-common"
+  }
+  stages {
+    stage('checkout') {
+      agent any
+      steps {
+        checkout([$class: 'GitSCM',
+            userRemoteConfigs: [
+              [url: 'https://github.com/advancedtelematic/aktualizr', name: 'aktualizr']
+            ],
+            branches: [[name: 'refs/heads/master']],
+            extensions: [
+              [$class: 'DisableRemotePoll'],
+              [$class: 'PruneStaleBranch'],
+              [$class: 'RelativeTargetDirectory',
+                relativeTargetDir: 'aktualizr'
+              ]
+            ],
+        ])
+
+        checkout([$class: 'RepoScm',
+            manifestRepositoryUrl: 'https://github.com/advancedtelematic/updater-repo',
+            manifestBranch: null,
+            manifestFile: 'master.xml',
+            manifestGroup: null,
+            mirrorDir: null,
+            jobs: 0,
+            depth: 0,
+            localManifest: null,
+            destinationDir: 'updater-repo',
+            repoUrl: null,
+            currentBranch: false,
+            resetFirst: true,
+            quiet: false,
+            trace: false,
+            showAllChanges: false,
+        ])
+
+        // ignore bitbake build directories in docker
+        sh 'echo \'build*\' > .dockerignore'
+
+        // override meta-updater commit with currently tested branch
+        sh '''
+           META_UPDATER_COMMIT=$(git rev-parse HEAD)
+           cd updater-repo/meta-updater
+           git checkout $META_UPDATER_COMMIT
+           '''
+      }
+    }
+    stage('build-core-image-minimal') {
+      agent {
+        dockerfile {
+          filename 'scripts/ci/Dockerfile.bitbake'
+          args '-v /opt/jenkins/bitbake-common:/opt/jenkins/bitbake-common'
+        }
+      }
+      steps {
+        sh 'scripts/ci/configure.sh'
+
+        sh 'scripts/ci/build.sh core-image-minimal'
+      }
+    }
+  }
+}
+// vim: set ft=groovy tabstop=2 shiftwidth=2 expandtab:
diff --git a/scripts/ci/README.adoc b/scripts/ci/README.adoc
new file mode 100644
index 0000000..222982b
--- /dev/null
+++ b/scripts/ci/README.adoc
@@ -0,0 +1,14 @@
+= Jenkins setup for running meta-updater CI
+
+As bitbake is quite resource-hungry, there are some special steps that are
+needed to run Jenkins CI tasks:
+
+- docker should be installed and the `jenkins` unix user should belong to
+  the `docker` group
+- `/opt/jenkins` should exist and have `jenkins:jenkins` permissions, it
+  will be mapped as a volume on the same location in the docker build
+  container
+
+Note that for nodes running Jenkins slaves as a docker container, the
+`/opt/jenkins` directory must exist on the host system as well, with
+permissions matching the user and groupd ids in Jenkins' docker
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
new file mode 100755
index 0000000..6235428
--- /dev/null
+++ b/scripts/ci/build.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+TEST_MACHINE=${TEST_MACHINE:-qemux86-64}
+TEST_BUILD_DIR=${TEST_BUILD_DIR:-build}
+TEST_REPO_DIR=${TEST_REPO_DIR:-updater-repo}
+
+IMAGE_NAME=${1:-core-image-minimal}
+
+(
+set +euo pipefail
+set +x
+. "${TEST_REPO_DIR}/meta-updater/scripts/envsetup.sh" "${TEST_MACHINE}" "${TEST_BUILD_DIR}"
+
+bitbake "${IMAGE_NAME}"
+)
diff --git a/scripts/ci/configure.sh b/scripts/ci/configure.sh
new file mode 100755
index 0000000..1e87a7b
--- /dev/null
+++ b/scripts/ci/configure.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+TEST_MACHINE=${TEST_MACHINE:-qemux86-64}
+TEST_BUILD_DIR=${TEST_BUILD_DIR:-build}
+TEST_REPO_DIR=${TEST_REPO_DIR:-updater-repo}
+
+TEST_AKTUALIZR_DIR=${TEST_AKTUALIZR_DIR:-.}
+TEST_AKTUALIZR_BRANCH=${TEST_AKTUALIZR_BRANCH:-master}
+TEST_AKTUALIZR_REV=${TEST_AKTUALIZR_REV:-$(GIT_DIR="$TEST_AKTUALIZR_DIR/.git" git rev-parse "$TEST_AKTUALIZR_REMOTE/$TEST_AKTUALIZR_BRANCH")}
+TEST_BITBAKE_COMMON_DIR=${TEST_BITBAKE_COMMON_DIR:-}
+
+# move existing conf directory to backup, before generating a new one
+rm -rf "${TEST_BUILD_DIR}/conf.old" || true
+mv "${TEST_BUILD_DIR}/conf" "${TEST_BUILD_DIR}/conf.old" || true
+
+(
+set +euo pipefail
+set +x
+echo ">> Running envsetup.sh"
+. "${TEST_REPO_DIR}/meta-updater/scripts/envsetup.sh" "${TEST_MACHINE}" "${TEST_BUILD_DIR}"
+)
+
+set +x
+
+echo ">> Set common bitbake config options"
+cat << EOF > "${TEST_BUILD_DIR}/conf/site.conf"
+SANITY_TESTED_DISTROS = ""
+SSTATE_MIRRORS ?= "file://.* https://bitbake-cache.atsgarage.com/PATH;downloadfilename=PATH"
+IMAGE_FEATURES += "ssh-server-openssh"
+
+EOF
+
+echo ">> Set aktualizr branch in bitbake's config"
+cat << EOF >> "${TEST_BUILD_DIR}/conf/site.conf"
+SRCREV_pn-aktualizr = "$TEST_AKTUALIZR_REV"
+SRCREV_pn-aktualizr-native = "\${SRCREV_pn-aktualizr}"
+BRANCH_pn-aktualizr = "$TEST_AKTUALIZR_BRANCH"
+BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}"
+
+EOF
+
+if [[ -n $TEST_BITBAKE_COMMON_DIR ]]; then
+    echo ">> Set caching"
+    SSTATE_DIR="$TEST_BITBAKE_COMMON_DIR/sstate-cache"
+    DL_DIR="$TEST_BITBAKE_COMMON_DIR/downloads"
+    mkdir -p "$SSTATE_DIR" "$DL_DIR"
+    cat << EOF >> "${TEST_BUILD_DIR}/conf/site.conf"
+SSTATE_DIR = "$SSTATE_DIR"
+DL_DIR = "$DL_DIR"
+EOF
+fi