From fad3cb82322a61a6dc436df50e50e2cc54d42e8e Mon Sep 17 00:00:00 2001
From: Hristo Bozhilov <Hristo.Bozhilov@bosch.com>
Date: Thu, 31 Aug 2023 15:04:00 +0200
Subject: [PATCH] Update recipe for Kanto Update Manager in kirkstone branch
 #69

Signed-off-by: Hristo Bozhilov <Hristo.Bozhilov@bosch.com>
---
 .../update-manager/files/config.json          |  3 +--
 .../update-manager/files/service.template     |  2 +-
 .../update-manager/update-manager_git.bb      | 20 +++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/recipes-management/update-manager/files/config.json b/recipes-management/update-manager/files/config.json
index 7a1a93a..3aeb31b 100644
--- a/recipes-management/update-manager/files/config.json
+++ b/recipes-management/update-manager/files/config.json
@@ -1,11 +1,10 @@
 {
     "log": {
-      "logFile": "@UM_LOG_DD@/update-manager/update-manager.log"
+      "logFile": "@UM_LOG_DD@/kanto-update-manager/kanto-update-manager.log"
     },
     "domain": "device",
     "agents": {
         "containers": {
-            "name": "containers",
             "rebootRequired": false,
             "readTimeout": "30s"
         }
diff --git a/recipes-management/update-manager/files/service.template b/recipes-management/update-manager/files/service.template
index cebc235..9470331 100644
--- a/recipes-management/update-manager/files/service.template
+++ b/recipes-management/update-manager/files/service.template
@@ -7,7 +7,7 @@ Requires=mosquitto.service
 
 [Service]
 Type=simple
-ExecStart=@UM_BIN_DD@/update-manager --config-file @UM_CFG_DD@/update-manager/config.json
+ExecStart=@UM_BIN_DD@/kanto-update-manager -config-file @UM_CFG_DD@/kanto-update-manager/config.json
 Restart=always
 
 [Install]
diff --git a/recipes-management/update-manager/update-manager_git.bb b/recipes-management/update-manager/update-manager_git.bb
index c11986d..4645e56 100644
--- a/recipes-management/update-manager/update-manager_git.bb
+++ b/recipes-management/update-manager/update-manager_git.bb
@@ -22,15 +22,15 @@ inherit systemd
 
 SYSTEMD_AUTO_ENABLE = "enable"
 SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
-SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','update-manager.service','',d)}"
+SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kanto-update-manager.service','',d)}"
 
 # workaround for network issue
 do_compile[network] = "1"
 
-FILES:${PN} += "${UM_SYSUNIT_DD}/update-manager.service"
-FILES:${PN} += "${UM_BIN_DD}/update-manager"
+FILES:${PN} += "${UM_SYSUNIT_DD}/kanto-update-manager.service"
+FILES:${PN} += "${UM_BIN_DD}/kanto-update-manager"
 # ensure all additional resources are properly packed in the resulting package if provided
-FILES:${PN} += "${UM_CFG_DD}/update-manager/config.json"
+FILES:${PN} += "${UM_CFG_DD}/kanto-update-manager/config.json"
 
 RDEPENDS:${PN} += "mosquitto"
 
@@ -43,27 +43,27 @@ RPROVIDES:${PN} += "kanto/update-manager"
 do_install() {
   install -d "${D}/${UM_BIN_DD}"
 
-  install -m 0755 "${GO_BUILD_BINDIR}/update-manager" "${D}${UM_BIN_DD}/update-manager"
+  install -m 0755 "${GO_BUILD_BINDIR}/update-manager" "${D}${UM_BIN_DD}/kanto-update-manager"
 
   if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
     install -d ${D}${UM_SYSUNIT_DD}
 
     # update-manager
-    install -d ${D}${UM_CFG_DD}/update-manager
+    install -d ${D}${UM_CFG_DD}/kanto-update-manager
 
     # config.json
-    install -m 0644 ${WORKDIR}/config.json ${D}${UM_CFG_DD}/update-manager
+    install -m 0644 ${WORKDIR}/config.json ${D}${UM_CFG_DD}/kanto-update-manager
 
     # service.template as service
-    install -m 0644 ${WORKDIR}/service.template ${D}${UM_SYSUNIT_DD}/update-manager.service
+    install -m 0644 ${WORKDIR}/service.template ${D}${UM_SYSUNIT_DD}/kanto-update-manager.service
 
     # fill in the update-manager systemd service template with the custom configs provided
     sed -e 's,@UM_BIN_DD@,${UM_BIN_DD},g' \
         -e 's,@UM_CFG_DD@,${UM_CFG_DD},g' \
-        -i ${D}${UM_SYSUNIT_DD}/update-manager.service
+        -i ${D}${UM_SYSUNIT_DD}/kanto-update-manager.service
 
     # fill in the config.json template with the custom configs provided
     sed -e 's,@UM_LOG_DD@,${UM_LOG_DD},g' \
-        -i ${D}${UM_CFG_DD}/update-manager/config.json
+        -i ${D}${UM_CFG_DD}/kanto-update-manager/config.json
   fi
 }