From: Scott Murray <scott.murray@konsulko.com>
Date: Sat, 20 May 2017 15:12:55 +0000 (-0400)
Subject: run-agl-postinsts: run before systemd-user-sessions
X-Git-Tag: 3.99.1~13
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F9439%2F2;p=AGL%2Fmeta-agl.git

run-agl-postinsts: run before systemd-user-sessions

Add setting of Before to the template scheme in the run-agl-postinsts
recipe, and use it to make sure run-agl-postinsts runs before
systemd-user-sessions.  This ensures that on first boot all of the
applications will be installed before HomeScreen is started in the
user session.

Bug-AGL: SPEC-580

Change-Id: I08026f225971e1fe38e984dfed5fc2656955942c
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9439
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
---

diff --git a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service b/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service
index a80b16002..61d6d4679 100644
--- a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service
+++ b/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service
@@ -2,6 +2,7 @@
 Description=Run pending agl postinsts
 DefaultDependencies=no
 After=#SYSTEMD_SERVICE_AFTER#
+Before=#SYSTEMD_SERVICE_BEFORE#
 ConditionPathExists=#SYSCONFDIR#/agl-postinsts
 
 [Service]
diff --git a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb b/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
index 5b5e18a99..96c171fa8 100644
--- a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
+++ b/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
@@ -16,6 +16,8 @@ SYSTEMD_SERVICE_${PN} = "run-agl-postinsts.service"
 
 SYSTEMD_SERVICE_AFTER ?= "dbus.service cynara.service"
 
+SYSTEMD_SERVICE_BEFORE ?= "systemd-user-sessions.service"
+
 do_configure() {
     :
 }
@@ -39,6 +41,7 @@ do_install() {
                ${D}${systemd_unitdir}/system/run-agl-postinsts.service
  
     sed -i -e 's:#SYSTEMD_SERVICE_AFTER#:${SYSTEMD_SERVICE_AFTER}:g' \
+               -e 's:#SYSTEMD_SERVICE_BEFORE#:${SYSTEMD_SERVICE_BEFORE}:g' \
                ${D}${systemd_unitdir}/system/run-agl-postinsts.service
 }