4 files changed, 48 insertions, 2 deletions

diff --git a/recipes-sota/aktualizr/aktualizr-secondary-conf.bb b/recipes-sota/aktualizr/aktualizr-secondary-conf.bb
new file mode 100644
index 0000000..c13bf94
--- /dev/null
+++ b/recipes-sota/aktualizr/aktualizr-secondary-conf.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Aktualizr secondary configuration"
+DESCRIPTION = "Systemd service and configurations for Aktualizr secondaries"
+HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
+SECTION = "base"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
+RDEPENDS_${PN} = "aktualizr-secondary"
+PV = "1.0"
+
+SRC_URI = " \
+  file://LICENSE \
+  "
+
+export SOTA_SECONDARY_HARDWARE_ID
+
+do_install() {
+  AKTUALIZR_PARAMETERS_CONFIGFILE="--config /usr/lib/sota/sota_secondary.toml"
+  if [ -n "${SOTA_SECONDARY_HARDWARE_ID}" ]; then
+    AKTUALIZR_PARAMETERS_HARDWARE_ID="--ecu-hardware-id ${SOTA_SECONDARY_HARDWARE_ID}";
+  fi
+
+  install -d ${D}${libdir}/sota
+  echo "AKTUALIZR_CMDLINE_PARAMETERS=${AKTUALIZR_PARAMETERS_CONFIGFILE} ${AKTUALIZR_PARAMETERS_HARDWARE_ID}" > ${D}${libdir}/sota/sota.env
+}
+
+FILES_${PN} = "${libdir}/sota/sota.env"
+
+# vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-sota/aktualizr/environment-secondary.inc b/recipes-sota/aktualizr/environment-secondary.inc
new file mode 100644
index 0000000..18a4684
--- /dev/null
+++ b/recipes-sota/aktualizr/environment-secondary.inc
@@ -0,0 +1,12 @@
+export SOTA_SECONDARY_HARDWARE_ID
+
+do_install_append() {
+  AKTUALIZR_PARAMETERS_CONFIGFILE="--config /usr/lib/sota/sota_secondary.toml"
+  if [ -n "${SOTA_PRIMARY_HARDWARE_ID}" ]; then
+    AKTUALIZR_PARAMETERS_HARDWARE_ID="--ecu-hardware-id ${SOTA_PRIMARY_HARDWARE_ID}"
+  fi
+
+  echo "AKTUALIZR_CMDLINE_PARAMETERS=${AKTUALIZR_PARAMETERS_CONFIGFILE} ${AKTUALIZR_PARAMETERS_HARDWARE_ID}" > ${D}${libdir}/sota/sota.env
+}
+
+FILES_${PN}_append = " ${libdir}/sota/sota.env"
diff --git a/recipes-sota/aktualizr/environment.inc b/recipes-sota/aktualizr/environment.inc
index 16e789e..73517b0 100644
--- a/recipes-sota/aktualizr/environment.inc
+++ b/recipes-sota/aktualizr/environment.inc
@@ -1,11 +1,16 @@
 export SOTA_VIRTUAL_SECONDARIES
+export SOTA_PRIMARY_HARDWARE_ID
 
 do_install_append() {
   for sec in ${SOTA_VIRTUAL_SECONDARIES}; do
     AKTUALIZR_PARAMETERS_VIRTUALSECS="${AKTUALIZR_PARAMETERS_VIRTUALSECS} --secondary-config $sec"
   done
 
-  echo "AKTUALIZR_CMDLINE_PARAMETERS=${AKTUALIZR_PARAMETERS_VIRTUALSECS}" > ${D}${libdir}/sota/sota.env
+  if [ -n "${SOTA_PRIMARY_HARDWARE_ID}" ]; then
+    AKTUALIZR_PARAMETERS_HARDWARE_ID="--primary-ecu-hardware-id ${SOTA_PRIMARY_HARDWARE_ID}"
+  fi
+
+  echo "AKTUALIZR_CMDLINE_PARAMETERS=${AKTUALIZR_PARAMETERS_VIRTUALSECS} ${AKTUALIZR_PARAMETERS_HARDWARE_ID}" > ${D}${libdir}/sota/sota.env
 }
 
 FILES_${PN}_append = " ${libdir}/sota/sota.env"
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.service b/recipes-sota/aktualizr/files/aktualizr-secondary.service
index a1e0e1b..5173ae9 100644
--- a/recipes-sota/aktualizr/files/aktualizr-secondary.service
+++ b/recipes-sota/aktualizr/files/aktualizr-secondary.service
@@ -4,6 +4,7 @@ Description=Aktualizr SOTA Client (UPTANE Secondary)
 [Service]
 RestartSec=10
 Restart=always
+EnvironmentFile=/usr/lib/sota/sota.env
 EnvironmentFile=-/etc/sota/sota.env
-ExecStart=/usr/bin/aktualizr-secondary --config /usr/lib/sota/sota_secondary.toml
+ExecStart=/usr/bin/aktualizr-secondary $AKTUALIZR_CMDLINE_PARAMETERS