From 66a4721d0b7885a18db952d69f7ee385a95b2f2b Mon Sep 17 00:00:00 2001
From: Phil Wise <phil@advancedtelematic.com>
Date: Wed, 14 Mar 2018 16:00:53 +0100
Subject: Add systemd socket activation for secondary

---
 lib/oeqa/selftest/cases/updater.py                       |  5 +++++
 recipes-sota/aktualizr/aktualizr_git.bb                  | 15 ++++++++++++++-
 recipes-sota/aktualizr/files/aktualizr-secondary.service |  9 +++++++++
 recipes-sota/aktualizr/files/aktualizr-secondary.socket  |  5 +++++
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 recipes-sota/aktualizr/files/aktualizr-secondary.service
 create mode 100644 recipes-sota/aktualizr/files/aktualizr-secondary.socket

diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index a5072e8..1850d98 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -543,6 +543,11 @@ class SecondaryTests(OESelftestTestCase):
         self.assertEqual(retcode, 0, "Unable to run aktualizr-secondary --help")
         self.assertEqual(stderr, b'', 'Error: ' + stderr.decode())
 
+    def test_secondary_listening(self):
+        print('Checking aktualizr-secondary is present')
+        stdout, stderr, retcode = self.qemu_command('echo test | nc localhost 9030')
+        self.assertEqual(retcode, 0, "Unable to connect to secondary")
+
 def qemu_launch(efi=False, machine=None, imagename=None):
     logger = logging.getLogger("selftest")
     logger.info('Running bitbake to build core-image-minimal')
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index ad06339..5e683ac 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -18,9 +18,11 @@ PR = "7"
 SRC_URI = " \
   gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \
   file://aktualizr.service \
+  file://aktualizr-secondary.service \
+  file://aktualizr-secondary.socket \
   file://aktualizr-serialcan.service \
   "
-SRCREV = "dca6271f4ec06eb2272cc99b4b9cf76a9805f18d"
+SRCREV = "fbb3404824c4eb239455c7fa1a794c26e2ea954d"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
@@ -28,7 +30,10 @@ S = "${WORKDIR}/git"
 inherit cmake
 
 inherit systemd
+
+SYSTEMD_PACKAGES = "${PN} ${PN}-secondary"
 SYSTEMD_SERVICE_${PN} = "aktualizr.service"
+SYSTEMD_SERVICE_${PN}-secondary = "aktualizr-secondary.socket"
 
 BBCLASSEXTEND =+ "native"
 
@@ -39,6 +44,11 @@ EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF -
 do_install_append () {
     rm -fr ${D}${libdir}/systemd
     rm -f ${D}${libdir}/sota/sota.toml # Only needed for the Debian package
+    install -d ${D}${libdir}/sota
+    install -m 0644 ${S}/config/sota_secondary.toml ${D}/${libdir}/sota/sota_secondary.toml
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/aktualizr-secondary.socket ${D}${systemd_unitdir}/system/aktualizr-secondary.socket
+    install -m 0644 ${WORKDIR}/aktualizr-secondary.service ${D}${systemd_unitdir}/system/aktualizr-secondary.service
 }
 do_install_append_class-target () {
     install -d ${D}${systemd_unitdir}/system
@@ -84,6 +94,9 @@ FILES_${PN}-host-tools = " \
 
 FILES_${PN}-secondary = " \
                 ${bindir}/aktualizr-secondary \
+                ${libdir}/sota/sota_secondary.toml \
+                ${systemd_unitdir}/system/aktualizr-secondary.socket \
+                ${systemd_unitdir}/system/aktualizr-secondary.service \
                 "
 
 # Both primary and secondary need the SQL Schemas
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.service b/recipes-sota/aktualizr/files/aktualizr-secondary.service
new file mode 100644
index 0000000..a1e0e1b
--- /dev/null
+++ b/recipes-sota/aktualizr/files/aktualizr-secondary.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Aktualizr SOTA Client (UPTANE Secondary)
+
+[Service]
+RestartSec=10
+Restart=always
+EnvironmentFile=-/etc/sota/sota.env
+ExecStart=/usr/bin/aktualizr-secondary --config /usr/lib/sota/sota_secondary.toml
+
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.socket b/recipes-sota/aktualizr/files/aktualizr-secondary.socket
new file mode 100644
index 0000000..1cb4269
--- /dev/null
+++ b/recipes-sota/aktualizr/files/aktualizr-secondary.socket
@@ -0,0 +1,5 @@
+[Socket]
+ListenStream=9030
+
+[Install]
+WantedBy=sockets.target
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf