10 files changed, 158 insertions, 25 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 942ef6a..798ceba 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,3 +10,4 @@ BBFILE_PATTERN_sota = "^${LAYERDIR}/"
 BBFILE_PRIORITY_sota = "7"
 
 LAYERDEPENDS_sota = "filesystems-layer"
+LAYERSERIES_COMPAT_sota = "sumo"
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 2efef15..0253a84 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -71,17 +71,17 @@ class GeneralTests(OESelftestTestCase):
 
         logger.info('Running bitbake with man in the image package list')
         self.append_config('IMAGE_INSTALL_append = " man "')
-        bitbake('-c cleanall man')
+        bitbake('-c cleanall man-db')
         bitbake('core-image-minimal')
         result = runCmd('oe-pkgdata-util find-path /usr/bin/man')
-        self.assertEqual(result.output, 'man: /usr/bin/man')
+        self.assertEqual(result.output, 'man-db: /usr/bin/man')
         path1 = os.path.realpath(image_path)
         size1 = os.path.getsize(path1)
         logger.info('First image %s has size %i' % (path1, size1))
 
         logger.info('Running bitbake without man in the image package list')
         self.append_config('IMAGE_INSTALL_remove = " man "')
-        bitbake('-c cleanall man')
+        bitbake('-c cleanall man-db')
         bitbake('core-image-minimal')
         result = runCmd('oe-pkgdata-util find-path /usr/bin/man', ignore_status=True)
         self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output)
@@ -439,8 +439,7 @@ class HsmTests(OESelftestTestCase):
         # Strip off line ending.
         value = stdout.decode()[:-1]
         self.assertEqual(value, machine,
-                         'MACHINE does not match hostname: ' + machine + ', ' + value +
-                         '\nIs tianocore ovmf installed?')
+                         'MACHINE does not match hostname: ' + machine + ', ' + value)
         print(value)
         print('Checking output of aktualizr-info:')
         ran_ok = False
diff --git a/recipes-bsp/grub/grub-efi_%.bbappend b/recipes-bsp/grub/grub-efi_%.bbappend
deleted file mode 100644
index bebb006..0000000
--- a/recipes-bsp/grub/grub-efi_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-
-GRUB_BUILDIN_append_sota = " configfile"
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
index 8deee7e..7f4f2e4 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Aktualizr configuration for autoprovisioning"
-DESCRIPTION = "Systemd service and configurations for autoprovisioning Aktualizr, the SOTA Client application written in C++"
+DESCRIPTION = "Configuration for automatically provisioning Aktualizr, the SOTA Client application written in C++"
 HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
 SECTION = "base"
 LICENSE = "MPL-2.0"
@@ -35,7 +35,8 @@ do_install() {
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         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-sota.toml
+        install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \
+            ${D}${libdir}/sota/conf.d/20-${aktualizr_toml}.toml
 
         # deploy SOTA credentials
         if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then
@@ -48,7 +49,7 @@ do_install() {
 
 FILES_${PN} = " \
                 ${libdir}/sota/conf.d \
-                ${libdir}/sota/conf.d/20-sota.toml \
+                ${libdir}/sota/conf.d/20-${aktualizr_toml}.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 319074e..4d5ff79 100644
--- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Aktualizr configuration for implicit provisioning with CA"
-DESCRIPTION = "Systemd service and configurations for implicitly provisioning Aktualizr using externally provided or generated CA"
+DESCRIPTION = "Configuration for implicitly provisioning Aktualizr using externally provided or generated CA"
 
 # WARNING: it is NOT a production solution. The secure way to provision devices is to create certificate request directly on the device
 #  (either with HSM/TPM or with software) and then sign it with a CA stored on a disconnected machine
@@ -36,7 +36,7 @@ do_install() {
         SOTA_CACERT_PATH=${DEPLOY_DIR_IMAGE}/CA/cacert.pem
         SOTA_CAKEY_PATH=${DEPLOY_DIR_IMAGE}/CA/ca.private.pem
         mkdir -p ${DEPLOY_DIR_IMAGE}/CA
-        bbwarn "SOTA_CACERT_PATH is not specified, use default one at $SOTA_CACERT_PATH" 
+        bbwarn "SOTA_CACERT_PATH is not specified, use default one at $SOTA_CACERT_PATH"
 
         if [ ! -f ${SOTA_CACERT_PATH} ]; then
             bbwarn "${SOTA_CACERT_PATH} does not exist, generate a new CA"
@@ -52,19 +52,20 @@ do_install() {
     fi
 
     install -m 0700 -d ${D}${localstatedir}/sota
-    install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov_ca.toml ${D}${libdir}/sota/conf.d/20-sota.toml
+    install -m 0644 ${STAGING_DIR_NATIVE}${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} \
                             --device-ca-key ${SOTA_CAKEY_PATH} \
                             --root-ca \
                             --server-url \
                             --local ${D}${localstatedir}/sota \
-                            --config ${D}${libdir}/sota/conf.d/20-sota.toml
+                            --config ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov_ca.toml
 }
 
 FILES_${PN} = " \
                 ${libdir}/sota/conf.d \
-                ${libdir}/sota/conf.d/20-sota.toml \
+                ${libdir}/sota/conf.d/20-sota_implicit_prov_ca.toml \
                 ${libdir}/sota/root.crt \
                 ${localstatedir}/sota/* \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
index 504f0d8..d526cd2 100644
--- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
@@ -1,12 +1,12 @@
 SUMMARY = "Aktualizr configuration with HSM support"
-DESCRIPTION = "Systemd service and configurations for HSM provisioning with Aktualizr, the SOTA Client application written in C++"
+DESCRIPTION = "Configuration for HSM provisioning with Aktualizr, the SOTA Client application written in C++"
 HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
 SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
 DEPENDS = "aktualizr-native"
-RDEPENDS_${PN} = "aktualizr softhsm softhsm-testtoken"
+RDEPENDS_${PN} = "aktualizr"
 
 SRC_URI = " \
   file://LICENSE \
@@ -19,15 +19,19 @@ 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 \
+        ${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/20-sota.toml -p ${D}
+            -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \
+            -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D}
     fi
 }
 
 FILES_${PN} = " \
                 ${libdir}/sota/conf.d \
-                ${libdir}/sota/conf.d/20-sota.toml \
+                ${libdir}/sota/conf.d/20-sota_hsm_prov.toml \
+                ${libdir}/sota/conf.d/30-implicit_server.toml \
                 "
 
 # vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
index dcfaffb..e08eeef 100644
--- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Aktualizr configuration for implicit provisioning"
-DESCRIPTION = "Systemd service and configurations for implicitly provisioning Aktualizr, the SOTA Client application written in C++"
+DESCRIPTION = "Configuration for implicitly provisioning Aktualizr, the SOTA Client application written in C++"
 HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
 SECTION = "base"
 LICENSE = "MPL-2.0"
@@ -19,15 +19,19 @@ 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 \
+        ${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/20-sota.toml -p ${D}
+            -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml \
+            -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D}
     fi
 }
 
 FILES_${PN} = " \
                 ${libdir}/sota/conf.d \
-                ${libdir}/sota/conf.d/20-sota.toml \
+                ${libdir}/sota/conf.d/20-implicit_prov.toml \
+                ${libdir}/sota/conf.d/30-implicit_server.toml \
                 ${libdir}/sota/root.crt \
                 "
 
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index f55eca8..8dc4b31 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -10,7 +10,8 @@ DEPENDS_append_class-target = "ostree ${@bb.utils.contains('SOTA_CLIENT_FEATURES
 DEPENDS_append_class-native = "glib-2.0-native "
 
 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', 'serialcan', ' slcand-start', '', d)} "
+RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' softhsm softhsm-testtoken', '', d)}"
 
 PV = "1.0+git${SRCPV}"
 PR = "7"
@@ -22,7 +23,7 @@ SRC_URI = " \
   file://aktualizr-secondary.socket \
   file://aktualizr-serialcan.service \
   "
-SRCREV = "3b89858cf8ce9a8331cc4e6a5d2b5783d2eb7ae9"
+SRCREV = "114dc6c519ca9a605d73ad292821348607d0fa12"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-support/ca-certificates/ca-certificates_%.bbappend b/recipes-support/ca-certificates/ca-certificates_%.bbappend
deleted file mode 100644
index cc95a68..0000000
--- a/recipes-support/ca-certificates/ca-certificates_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-SYSROOT_DIRS += "${sysconfdir}"
diff --git a/scripts/find_packages.py b/scripts/find_packages.py
new file mode 100755
index 0000000..7a60a17
--- /dev/null
+++ b/scripts/find_packages.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+
+import os.path
+import sys
+
+scripts_path = os.path.dirname(os.path.realpath(__file__))
+bb_lib_path = os.path.abspath(scripts_path + '/../../poky/bitbake/lib')
+sys.path = sys.path + [bb_lib_path]
+
+import bb.fetch2
+import bb.tinfoil
+
+
+def print_deps(tinfoil, abcd_file, rn):
+    try:
+        info = tinfoil.get_recipe_info(rn)
+    except Exception:
+        print('Failed to get recipe info for: %s' % rn)
+        return []
+    if not info:
+        print('No recipe info found for: %s' % rn)
+        return []
+    append_files = tinfoil.get_file_appends(info.fn)
+    appends = True
+    data = tinfoil.parse_recipe_file(info.fn, appends, append_files)
+    src_uri = data.getVar('SRC_URI').split()
+    lic = data.getVar('LICENSE')
+    summary = data.getVar('SUMMARY')
+    description = data.getVar('DESCRIPTION')
+    homepage = data.getVar('HOMEPAGE')
+    srcrev = data.getVar('SRCREV')
+    branch = data.getVar('BRANCH')
+    depends = data.getVar('DEPENDS').split()
+
+    abcd_file.write('- id:\n')
+    abcd_file.write('    package_manager: "Yocto"\n')
+    abcd_file.write('    name: "%s"\n' % info.pn)
+    abcd_file.write('    version: "%s"\n' % info.pv)
+    abcd_file.write('  declared_lics:\n')
+    abcd_file.write('  - "%s"\n' % lic)
+    if summary:
+        abcd_file.write('  description: "%s"\n' % summary)
+    else:
+        abcd_file.write('  description: "%s"\n' % description)
+    abcd_file.write('  homepage_url: "%s"\n' % homepage)
+    abcd_file.write('  source_artifact:\n')
+    repos = []
+    for src in src_uri:
+        # Strip options.
+        # TODO: ignore files with apply=false?
+        src = src.split(';', maxsplit=1)[0]
+        src_type = src.split('://', maxsplit=1)[0]
+        if src_type == 'file':
+            # TODO: Get full path of patches and other files within the source
+            # repo, not just the filesystem?
+            fetch = bb.fetch2.Fetch([], data)
+            local = fetch.localpath(src)
+            abcd_file.write('  - "%s"\n' % local)
+        else:
+            abcd_file.write('  - "%s"\n' % src)
+            if src_type != 'http' and src_type != 'https' and src_type != 'ftp' and src_type != 'ssh':
+                repos.append(src)
+    if len(repos) > 1:
+        print('Multiple repos not fully supported yet. Pacakge: %s' % info.pn)
+    for repo in repos:
+        vcs_type, url = repo.split('://', maxsplit=1)
+        abcd_file.write('  vcs:\n')
+        if vcs_type == 'gitsm':
+            vcs_type = 'git'
+        abcd_file.write('    type: "%s"\n' % vcs_type)
+        abcd_file.write('    url: "%s"\n' % url)
+        # TODO: Actually support multiple repos here:
+        abcd_file.write('    revision: "%s"\n' % srcrev)
+        abcd_file.write('    branch: "%s"\n' % branch)
+
+    abcd_file.write('  dependencies:\n')
+    for dep in depends:
+        abcd_file.write('  - "%s"\n' % dep)
+        # TODO: search for transitive dependencies here? Each dependency will
+        # get checked for its own dependencies sooner or later.
+
+    return depends
+
+
+def main():
+    abcd_manifest = 'manifest.abcd'
+    with open(abcd_manifest, "w") as abcd_file, bb.tinfoil.Tinfoil() as tinfoil:
+        tinfoil.prepare()
+        # These are the packages that bitbake assumes are provided by the host
+        # system. They do not have recipes, so searching tinfoil for them will
+        # not work. Anyway, by nature they are not included in code we release,
+        # only used by it.
+        assume_provided = tinfoil.config_data.getVar('ASSUME_PROVIDED').split()
+        abcd_file.write('packages:\n')
+
+        # Does NOT include garage-sign, anything used only for testing (i.e.
+        # strace and gtest), any of the git submodules, all of which are also
+        # only used for testing (tuf-test-vectors, isotp-c, ostreesysroot,
+        # and HdrHistogram_c), or any other third party modules included
+        # directly into the source tree (jsoncpp, open62541, picojson)
+        recipes_to_check = ['aktualizr',
+                            'aktualizr-native',
+                            'aktualizr-auto-prov',
+                            'aktualizr-implicit-prov',
+                            'aktualizr-ca-implicit-prov',
+                            'aktualizr-hsm-prov',
+                            'aktualizr-disable-send-ip',
+                            'aktualizr-example-interface',
+                            'aktualizr-log-debug',
+                            'libp11', # BUILD_P11 (HSM) only
+                            'dpkg', # BUILD_DEB only
+                            'systemd'] # BUILD_SYSTEMD only
+
+        # Iterate through the list of recipes to check. Append any dependencies
+        # found that aren't already in the list. As long as we only add to the
+        # list, it should be safe.
+        for recipe in recipes_to_check:
+            depends = print_deps(tinfoil, abcd_file, recipe)
+            for dep in depends:
+                if dep not in recipes_to_check and dep not in assume_provided:
+                    recipes_to_check.append(dep)
+
+
+if __name__ == "__main__":
+    main()