From 691eb035bea3a55f7e4257ce837865bec244830e Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Tue, 13 Nov 2018 12:18:41 +0100
Subject: aktualizr: use config instead of environment variables.

This should make the secondary config dir process better anyway, and it
finally gets rid of a hacky workaround that we'd been using for ages.

Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
---
 recipes-sota/aktualizr/aktualizr-auto-prov.bb            | 1 -
 recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb     | 1 -
 recipes-sota/aktualizr/aktualizr-hsm-prov.bb             | 1 -
 recipes-sota/aktualizr/aktualizr_git.bb                  | 1 +
 recipes-sota/aktualizr/environment.inc                   | 8 --------
 recipes-sota/aktualizr/files/aktualizr-secondary.service | 1 -
 recipes-sota/aktualizr/files/aktualizr.service           | 2 --
 7 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 recipes-sota/aktualizr/environment.inc

diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
index 39a5e6e..f506cab 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
@@ -12,7 +12,6 @@ PR = "6"
 
 SRC_URI = ""
 
-require environment.inc
 require credentials.inc
 
 do_install() {
diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
index 2763185..5893ed2 100644
--- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
@@ -15,7 +15,6 @@ RDEPENDS_${PN}_append = "${@' aktualizr-ca-implicit-prov-creds' if d.getVar('SOT
 PV = "1.0"
 PR = "1"
 
-require environment.inc
 require credentials.inc
 
 do_install() {
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
index 151b543..08fffe9 100644
--- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
@@ -12,7 +12,6 @@ SRC_URI = ""
 PV = "1.0"
 PR = "6"
 
-require environment.inc
 require credentials.inc
 
 do_install() {
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index e44780f..9cc7c7a 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -75,6 +75,7 @@ do_install_append () {
         if [ -d "${SOTA_SECONDARY_CONFIG_DIR}" ]; then
             install -m 0700 -d ${D}${sysconfdir}/sota/ecus
             install -m 0644 "${SOTA_SECONDARY_CONFIG_DIR}"/* ${D}${sysconfdir}/sota/ecus/
+            echo "[uptane]\nsecondary_configs_dir = /etc/sota/ecus/\n" > ${D}${libdir}/sota/conf.d/30-secondary-configs-dir.toml
         else
             bbwarn "SOTA_SECONDARY_CONFIG_DIR is set to an invalid directory (${SOTA_SECONDARY_CONFIG_DIR})"
         fi
diff --git a/recipes-sota/aktualizr/environment.inc b/recipes-sota/aktualizr/environment.inc
deleted file mode 100644
index 0b46a2e..0000000
--- a/recipes-sota/aktualizr/environment.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-do_install_append() {
-  if [ -n "${SOTA_SECONDARY_CONFIG_DIR}" ]; then
-    AKTUALIZR_CMDLINE_PARAMETERS="${AKTUALIZR_CMDLINE_PARAMETERS} --secondary-configs-dir /etc/sota/ecus"
-  fi
-  echo "AKTUALIZR_CMDLINE_PARAMETERS=${AKTUALIZR_CMDLINE_PARAMETERS}" > ${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..9628ee3 100644
--- a/recipes-sota/aktualizr/files/aktualizr-secondary.service
+++ b/recipes-sota/aktualizr/files/aktualizr-secondary.service
@@ -4,6 +4,5 @@ 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.service b/recipes-sota/aktualizr/files/aktualizr.service
index 6de4474..726809e 100644
--- a/recipes-sota/aktualizr/files/aktualizr.service
+++ b/recipes-sota/aktualizr/files/aktualizr.service
@@ -5,8 +5,6 @@ After=network.target
 [Service]
 RestartSec=10
 Restart=always
-EnvironmentFile=/usr/lib/sota/sota.env
-EnvironmentFile=-/etc/sota/sota.env
 ExecStart=/usr/bin/aktualizr $AKTUALIZR_CMDLINE_PARAMETERS
 
 [Install]
-- 
cgit v1.2.3-54-g00ecf