From 7215783ffa0d9cc14ce55cd2ee4ea3e5595309bb Mon Sep 17 00:00:00 2001
From: Michael Scott <mike@foundries.io>
Date: Thu, 18 Jun 2020 16:40:47 -0700
Subject: [PATCH] base: recipes-sota: aktualizr: enable changing
 COMPOSE_HTTP_TIMEOUT value

Subscribers may want to tweak the timeout of docker compose pull.  Let's turn
the service file into a template that can accomodate different values for
COMPOSE_HTTP_TIMEOUT.

Signed-off-by: Michael Scott <mike@foundries.io>
---
 .../{aktualizr-lite.service => aktualizr-lite.service.in} | 1 +
 meta-lmp-base/recipes-sota/aktualizr/aktualizr_%.bbappend | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 rename meta-lmp-base/recipes-sota/aktualizr/aktualizr/{aktualizr-lite.service => aktualizr-lite.service.in} (86%)

diff --git a/meta-lmp-base/recipes-sota/aktualizr/aktualizr/aktualizr-lite.service b/meta-lmp-base/recipes-sota/aktualizr/aktualizr/aktualizr-lite.service.in
similarity index 86%
rename from meta-lmp-base/recipes-sota/aktualizr/aktualizr/aktualizr-lite.service
rename to meta-lmp-base/recipes-sota/aktualizr/aktualizr/aktualizr-lite.service.in
index e4b6ab3eeb..11a4109228 100644
--- a/meta-lmp-base/recipes-sota/aktualizr/aktualizr/aktualizr-lite.service
+++ b/meta-lmp-base/recipes-sota/aktualizr/aktualizr/aktualizr-lite.service.in
@@ -8,6 +8,7 @@ ConditionPathExists=!/usr/bin/mbedCloudClient
 [Service]
 RestartSec=180
 Restart=always
+Environment="COMPOSE_HTTP_TIMEOUT=@@COMPOSE_HTTP_TIMEOUT@@"
 ExecStart=/usr/bin/aktualizr-lite --update-lockfile /run/lock/aktualizr-lite-update daemon
 
 [Install]
diff --git a/meta-lmp-base/recipes-sota/aktualizr/aktualizr_%.bbappend b/meta-lmp-base/recipes-sota/aktualizr/aktualizr_%.bbappend
index d7e056925d..6f87cb9492 100644
--- a/meta-lmp-base/recipes-sota/aktualizr/aktualizr_%.bbappend
+++ b/meta-lmp-base/recipes-sota/aktualizr/aktualizr_%.bbappend
@@ -5,7 +5,7 @@ SRCREV_lmp = "41ebc462578014467297187782b04619e482118f"
 
 SRC_URI_lmp = "gitsm://github.com/foundriesio/aktualizr-lite;branch=${BRANCH};name=aktualizr \
     file://aktualizr.service \
-    file://aktualizr-lite.service \
+    file://aktualizr-lite.service.in \
     file://aktualizr-lite.path \
     file://aktualizr-secondary.service \
     file://aktualizr-serialcan.service \
@@ -27,12 +27,18 @@ PACKAGECONFIG[ubootenv] = ",,,u-boot-fw-utils u-boot-default-env aktualizr-uboot
 SYSTEMD_PACKAGES += "${PN}-lite"
 SYSTEMD_SERVICE_${PN}-lite = "aktualizr-lite.service aktualizr-lite.path"
 
+COMPOSE_HTTP_TIMEOUT ?= "60"
+
 # Workaround as aktualizr is a submodule of aktualizr-lite
 do_configure_prepend_lmp() {
     cd ${S}
     git log -1 --format=%h | tr -d '\n' > VERSION
 }
 
+do_compile_append_lmp() {
+    sed -e 's/@@COMPOSE_HTTP_TIMEOUT@@/${COMPOSE_HTTP_TIMEOUT}/' ${WORKDIR}/aktualizr-lite.service.in > ${WORKDIR}/aktualizr-lite.service
+}
+
 do_install_prepend_lmp() {
     # link the path to config so aktualizr's do_install_append will find config files
     [ -e ${S}/config ] || ln -s ${S}/aktualizr/config ${S}/config