Merge pull request #399 from advancedtelematic/refactor/remove-legacy-secondaries

aktualizr: remove example-interface.

4 files changed, 2 insertions, 35 deletions

diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 38bdcbf..b555d92 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -150,8 +150,6 @@ class AutoProvTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-auto-prov "')
-        # Test aktualizr-example-interface package.
-        self.append_config('IMAGE_INSTALL_append = " aktualizr-examples aktualizr-example-interface "')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
@@ -185,12 +183,6 @@ class AutoProvTests(OESelftestTestCase):
         self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
 
         verifyProvisioned(self, machine)
-        # Test aktualizr-example-interface package.
-        stdout, stderr, retcode = self.qemu_command('aktualizr-info')
-        self.assertIn(b'hardware ID: example1', stdout,
-                      'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode())
-        self.assertIn(b'hardware ID: example2', stdout,
-                      'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode())
 
 
 class ManualControlTests(OESelftestTestCase):
@@ -562,6 +554,7 @@ class HsmTests(OESelftestTestCase):
 
         verifyProvisioned(self, machine)
 
+
 class SecondaryTests(OESelftestTestCase):
     @classmethod
     def setUpClass(cls):
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 29164ed..751f529 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -26,7 +26,7 @@ SRC_URI = " \
   file://aktualizr-secondary.socket \
   file://aktualizr-serialcan.service \
   "
-SRCREV = "512ad74c0b5339ca7775d8c9461b565a9e6ff5b3"
+SRCREV = "6b0114e4fad0619d16ed2063e8ff10e3fb8500f2"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
@@ -48,7 +48,6 @@ EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF \
                  -DAKTUALIZR_VERSION=${PV} \
                  -DBUILD_LOAD_TESTS=OFF"
 EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON \
-                                      -DBUILD_ISOTP=ON \
                                       ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} "
 EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON \
                                       -DBUILD_OSTREE=OFF \
@@ -97,8 +96,6 @@ FILES_${PN} = " \
 
 FILES_${PN}-examples = " \
                 ${libdir}/sota/demo_secondary.json \
-                ${bindir}/example-interface \
-                ${bindir}/isotp-test-interface \
                 ${bindir}/hmi_stub \
                 "
 
diff --git a/recipes-sota/config/aktualizr-example-interface.bb b/recipes-sota/config/aktualizr-example-interface.bb
deleted file mode 100644
index ac75352..0000000
--- a/recipes-sota/config/aktualizr-example-interface.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "Aktualizr example interface"
-DESCRIPTION = "Aktualizr example interface for legacy secondaries"
-HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
-SECTION = "base"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
-
-SRC_URI = " \
-            file://30-example-interface.toml \
-            "
-
-do_install_append () {
-    install -m 0700 -d ${D}${libdir}/sota/conf.d
-    install -m 0644 ${WORKDIR}/30-example-interface.toml ${D}${libdir}/sota/conf.d/30-example-interface.toml
-}
-
-FILES_${PN} = " \
-                ${libdir}/sota/conf.d/30-example-interface.toml \
-                "
-
-# vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-sota/config/files/30-example-interface.toml b/recipes-sota/config/files/30-example-interface.toml
deleted file mode 100644
index fc4e9ec..0000000
--- a/recipes-sota/config/files/30-example-interface.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[uptane]
-legacy_interface = "/usr/bin/example-interface"