From 1257b0258554201cc8a559b734573b6345752e57 Mon Sep 17 00:00:00 2001
From: James Thomas <james.thomas@codethink.co.uk>
Date: Thu, 21 May 2015 14:48:51 +0000
Subject: Fix systemd units

---
 strata/genivi-demo-platform/genivi-demo-platform-hmi.morph | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
index d2cee815..e08debd6 100644
--- a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
+++ b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
@@ -50,11 +50,13 @@ install-commands:
 - cp -a app/gdp-hmi-launcher2/content/images/* $DESTDIR/usr/share/gdp/
 - cp -a app/gdp-hmi-panel/assets/* $DESTDIR/usr/share/gdp/
 - mkdir -p "$DESTDIR/usr/lib/systemd/user"
+- mkdir -p "$DESTDIR/usr/lib/systemd/user/default.target.wants"
 - |
   cat >"$DESTDIR/usr/lib/systemd/user/gdp-hmi-launcher2.service" <<EOF
   [Unit]
   Description=GENIVI Demo Platform HMI - Launcher2
-  After=gdp-hmi-controller.service gdp-hmi-background.service gdp-hmi-panel.service
+  Requires=gdp-hmi-controller.service
+  After=gdp-hmi-panel.service
   
   [Service]
   Environment=LD_PRELOAD=/usr/lib/libEGL.so
@@ -63,10 +65,12 @@ install-commands:
   [Install]
   WantedBy=default.target
   EOF
+- cd "$DESTDIR/usr/lib/systemd/user/default.target.wants" && ln -s ../gdp-hmi-launcher2.service .
 - |
   cat >"$DESTDIR/usr/lib/systemd/user/gdp-hmi-background.service" <<EOF
   [Unit]
   Description=GENIVI Demo Platform HMI - Background
+  Requires=gdp-hmi-controller.service
   After=gdp-hmi-controller.service
   
   [Service]
@@ -76,6 +80,7 @@ install-commands:
   [Install]
   WantedBy=default.target
   EOF
+- cd "$DESTDIR/usr/lib/systemd/user/default.target.wants" && ln -s ../gdp-hmi-background.service .
 - |
   cat >"$DESTDIR/usr/lib/systemd/user/gdp-hmi-controller.service" <<EOF
   [Unit]
@@ -92,11 +97,13 @@ install-commands:
   [Install]
   WantedBy=default.target
   EOF
+- cd "$DESTDIR/usr/lib/systemd/user/default.target.wants" && ln -s ../gdp-hmi-controller.service .
 - |
   cat >"$DESTDIR/usr/lib/systemd/user/gdp-hmi-panel.service" <<EOF
   [Unit]
   Description=GENIVI Demo Platform HMI - Panel
-  After=gdp-hmi-controller.service
+  Requires=gdp-hmi-controller.service
+  After=gdp-hmi-background.service
   
   [Service]
   Environment=LD_PRELOAD=/usr/lib/libEGL.so
@@ -105,6 +112,7 @@ install-commands:
   [Install]
   WantedBy=default.target
   EOF
+- cd "$DESTDIR/usr/lib/systemd/user/default.target.wants" && ln -s ../gdp-hmi-panel.service .
 - |
   cat >"$DESTDIR/usr/lib/systemd/user/EGLWLMockNavigation.service" <<EOF
   [Unit]
-- 
cgit v1.2.1