From: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
Date: Mon, 11 Sep 2017 07:07:39 +0000 (+0900)
Subject: mapview: It should be run user service instead of system
X-Git-Tag: 4.99.1~8
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=9879e35d670df53af43de123ce1804a7296531e1

mapview: It should be run user service instead of system

Change-Id: I65dd87561b80765ae2bbff5fc7f903ffe27394a8
Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
---

diff --git a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
index eba4a0dd0..c3f5515af 100644
--- a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
+++ b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
@@ -1,6 +1,6 @@
 [Unit]
 Conflicts=getty@tty1.service
-After=weston.service
+After=weston.service HomeScreen.service
 
 # map viewr is a child application which can work with navigation.
 # This app requires mapdata. It has to be stored at /var/mapdata/navi_data_UK .
@@ -17,6 +17,7 @@ ExecStartPost=/usr/AGL/mapviewer/mapviewer-settings.sh
 
 ExecStop=/usr/bin/killall -s KILL mapview
 Type=simple
+Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/recipes-demo-hmi/navigation/mapviewer_%.bbappend b/recipes-demo-hmi/navigation/mapviewer_%.bbappend
index a4eebfb4f..4e89af064 100644
--- a/recipes-demo-hmi/navigation/mapviewer_%.bbappend
+++ b/recipes-demo-hmi/navigation/mapviewer_%.bbappend
@@ -15,7 +15,8 @@ do_install_append() {
 
     # Install systemd unit files
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -m 644 -p -D ${WORKDIR}/mapviewer.service ${D}${systemd_system_unitdir}/mapviewer.service
+        install -d ${D}${systemd_user_unitdir}
+        install -m 644 -p -D ${WORKDIR}/mapviewer.service ${D}${systemd_user_unitdir}/mapviewer.service
     fi
 }
 
@@ -26,6 +27,6 @@ do_install_append() {
 #SYSTEMD_SERVICE_${PN} = "mapviewer.service"
 
 FILES_${PN} += " \
-    ${systemd_system_unitdir}/mapviewer.service \
+    ${systemd_user_unitdir}/mapviewer.service \
     /usr/AGL/mapviewer/ \
     "