X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-flutter%2Frecipes-graphics%2Ftoyota%2Fivi-homescreen_aglflutter.inc;h=48ba9d1d4f97db7b81607b76707f8e0c010d6a69;hb=f76a4e381d478a4bcad69909587d25f99051d24f;hp=767637b7d6587ca84852ef9376cee78cff20d572;hpb=a33b1ccc388386e71acd74232bc6f2518ebbb95b;p=AGL%2Fmeta-agl-devel.git

diff --git a/meta-agl-flutter/recipes-graphics/toyota/ivi-homescreen_aglflutter.inc b/meta-agl-flutter/recipes-graphics/toyota/ivi-homescreen_aglflutter.inc
index 767637b7..48ba9d1d 100644
--- a/meta-agl-flutter/recipes-graphics/toyota/ivi-homescreen_aglflutter.inc
+++ b/meta-agl-flutter/recipes-graphics/toyota/ivi-homescreen_aglflutter.inc
@@ -1,15 +1,29 @@
-# Potentially pin SRCREV here.  Use upstream's AUTOINC default for
-# development for now.
+# Upstream is now pinning ivi-homescreen
 #SRCREV = ""
 
 # For now disable gstreamer to avoid needing to enable "commercial"
 # licenses for the stated ffmpeg dependency.
 PACKAGECONFIG:remove = "gstreamer"
 
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
+SRC_URI += "file://config.json"
+
 # AGL specifics
-IVI_HOMESCREEN_APP_OVERRIDE = "--a=/usr/share/gallery"
+IVI_HOMESCREEN_APP_OVERRIDE = "--b=/usr/share/flutter/gallery --j=/usr/share/flutter/config.json"
+
+SERVICE_UNIT        = "Requires=agl-compositor.service\nAfter=agl-compositor.service"
+SERVICE_INSTALL     = "WantedBy=agl-session.target"
+# we have a regular/agl-driver user, so avoid setting one
+SERVICE_ENVIRONMENT = ""
+SERVICE_USER_GROUP  = ""
+SERVICE_RESTART	    = "Restart=on-failure"
+
+# we need to install as user session, not root.
+do_install:append() {
+    install -d ${D}${systemd_user_unitdir}/agl-session.target.wants
+    install -D -m 0644 ${WORKDIR}/config.json ${D}${datadir}/flutter/config.json
+    install -m0644 ${WORKDIR}/homescreen.service ${D}${systemd_user_unitdir}/homescreen.service
+    ln -s ../homescreen.service ${D}${systemd_user_unitdir}/agl-session.target.wants/homescreen.service
+}
 
-SERVICE_UNIT        = "Requires=weston.service\nAfter=weston.service"
-SERVICE_USER_GROUP  = "User=weston\nGroup=weston"
-SERVICE_RESTART     = ""
-SERVICE_ENVIRONMENT = "Environment=XDG_RUNTIME_DIR=/run/user/200"
+FILES:${PN} += " ${systemd_user_unitdir} ${datadir}/flutter/config.json"