diff mbox series

[meta-swupdate] Fix generation of systemd socket

Message ID 20221019140226.422712-1-sbabic@denx.de
State Accepted
Delegated to: Stefano Babic
Headers show
Series [meta-swupdate] Fix generation of systemd socket | expand

Commit Message

Stefano Babic Oct. 19, 2022, 2:02 p.m. UTC 
systemd sockets names in swupdate.socket are not generated anymore. As
effect, systemd won't create the sockets, that are then created by
SWUpdate at the startup. This hides the issue, because SWUpdate acts as
fallback in case sockets are not present.

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 recipes-support/swupdate/swupdate.inc | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc
index c4aab08..4c60e6d 100644
--- a/recipes-support/swupdate/swupdate.inc
+++ b/recipes-support/swupdate/swupdate.inc
@@ -195,23 +195,27 @@  python () {
         d.setVar('SWUPDATE_WWW', 'webapp')
 
     # Values not used here might be used in a bbappend
-    d.setVar('SWUPDATE_SOCKET_CTRL_PATH', '/tmp/sockinstctrl')
+    d.setVar("SWUPDATE_SOCKET_CTRL_PATH", "/tmp/sockinstctrl")
     d.setVar('SWUPDATE_SOCKET_PROGRESS_PATH', '/tmp/swupdateprog')
     d.setVar('SWUPDATE_HW_COMPATIBILITY_FILE', '/etc/hwrevision')
     d.setVar('SWUPDATE_SW_VERSIONS_FILE', '/etc/sw-versions')
     for feature in features:
         if feature.startswith('CONFIG_SOCKET_CTRL_PATH='):
-            ctrl_path = feature.split('=')[1].strip()
-            d.setVar('SWUPDATE_SOCKET_CTRL_PATH', ctrl_path)
+            ctrl_path = feature.split('=')[1].strip().replace('""','')
+            if ctrl_path != "": 
+               d.setVar('SWUPDATE_SOCKET_CTRL_PATH', ctrl_path)
         elif feature.startswith('CONFIG_SOCKET_PROGRESS_PATH='):
-            prog_path = feature.split('=')[1].strip()
-            d.setVar('SWUPDATE_SOCKET_PROGRESS_PATH', prog_path)
+            prog_path = feature.split('=')[1].strip().replace('""','')
+            if prog_path != "":
+               d.setVar('SWUPDATE_SOCKET_PROGRESS_PATH', prog_path)
         elif feature.startswith('CONFIG_HW_COMPATIBILITY_FILE='):
-            hwrev_file = feature.split('=')[1].strip()
-            d.setVar('SWUPDATE_HW_COMPATIBILITY_FILE', hwrev_file)
+            hwrev_file = feature.split('=')[1].strip().replace('""','')
+            if hwrev_file != "":
+               d.setVar('SWUPDATE_HW_COMPATIBILITY_FILE', hwrev_file)
         elif feature.startswith('CONFIG_SW_VERSIONS_FILE='):
-            swver_file = feature.split('=')[1].strip()
-            d.setVar('SWUPDATE_SW_VERSIONS_FILE', swver_file)
+            swver_file = feature.split('=')[1].strip().replace('""','')
+            if swver_file != "":
+               d.setVar('SWUPDATE_SW_VERSIONS_FILE', swver_file)
 }
 
 do_configure () {