aktualizr: support check-discovery and fix secondary tests.

Cherry-pick of 78422f6ca6e5cca90e33ad49aa1b39bb25c527b3 from master. Original
commit message follows:

Compatibility with latest aktualizr

Note that the HsmTests still sometimes fail

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 190d85d..08fb696 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -554,7 +554,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")
 
 
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index a2d03f2..a6e7dd2 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -15,6 +15,9 @@ RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES
 RDEPENDS_${PN}_append_class-target = " ${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'u-boot-fw-utils', '')}"
 RDEPENDS_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'ubootenv', '  aktualizr-uboot-env-rollback', '', d)} "
 
+RDEPENDS_${PN}_append_class-target = " ${PN}-tools "
+RDEPENDS_${PN}-secondary_append_class-target = " ${PN}-tools "
+
 PV = "1.0+git${SRCPV}"
 PR = "7"
 
@@ -85,7 +88,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 \
@@ -116,6 +119,10 @@ FILES_${PN}-host-tools = " \
                 ${libdir}/sota/sota_uboot_env.toml \
                 "
 
+FILES_${PN}-tools = " \
+                ${bindir}/aktualizr-check-discovery \
+                "
+
 FILES_${PN}-secondary = " \
                 ${bindir}/aktualizr-secondary \
                 ${libdir}/sota/sota_secondary.toml \