diff options
Diffstat (limited to 'meta-agl-flutter/recipes-graphics/flutter-apps')
| -rw-r--r-- | meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service | 9 | ||||
| -rw-r--r-- | meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc | 28 |
2 files changed, 15 insertions, 22 deletions
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service index 3d4ecbf1..80e31dda 100644 --- a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service +++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service @@ -3,8 +3,11 @@ Requires=agl-compositor.service After=agl-compositor.service [Service] -ExecStart=/usr/bin/flutter-auto --j=/usr/share/flutter/default.json --b=/usr/share/flutter/gallery --f -Restart=on-failure +User=agl-driver +EnvironmentFile=/etc/default/flutter +EnvironmentFile=-/etc/default/flutter-gallery +Environment=XDG_RUNTIME_DIR=/run/user/1001/ +ExecStart=/usr/bin/flutter-auto --b=/usr/share/flutter/gallery/${FLUTTER_VERSION}/${FLUTTER_RUNTIME} --f --window-type=BG [Install] -WantedBy=agl-session.target +WantedBy=graphical.target diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc index c618a2fe..61bcaa0e 100644 --- a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc +++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc @@ -1,28 +1,18 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/flutter-gallery:" -SRC_URI += " \ - file://flutter-gallery.service \ -" +SRC_URI += "file://flutter-gallery.service" -# To avoid conflicts with the systemd template scheme added via bbappend in -# meta-agl-demo, package the standalone systemd unit separately. This is not -# needed when meta-agl-flutter is used without meta-agl-demo, but that is not -# going to be the default usecase for most users, so this still allows them to -# build working agl-image-flutter images in the same build tree. -# -# This can be dropped if/when flutter-gallery is no longer packaged as a demo -# in meta-agl-demo. - -#SYSTEMD_SERVICE:${PN}-init = "flutter-gallery.service" +inherit systemd do_install:append() { - install -D -m 0644 ${WORKDIR}/flutter-gallery.service ${D}${systemd_user_unitdir}/flutter-gallery.service - install -d ${D}${systemd_user_unitdir}/agl-session.target.wants - ln -s ../flutter-gallery.service ${D}${systemd_user_unitdir}/agl-session.target.wants/flutter-gallery.service + install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service } -PACKAGE_BEFORE_PN += "${PN}-init" +#FILES:${PN} += "${systemd_system_unitdir}" -FILES:${PN}-init = "${systemd_user_unitdir}" +RDEPENDS:${PN} += "agl-flutter-env" -RDEPENDS:${PN}-init = "${PN}"
\ No newline at end of file +SYSTEMD_SERVICE:${PN} = "flutter-gallery.service" +# Explicitly disable auto-start to avoid interferring with Toyota workspace +# tooling usecase. +SYSTEMD_AUTO_ENABLE:${PN} = "disable" |