From 72ba8aacc32ff9039a2771320792bbd161632751 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 1 Jun 2023 19:01:04 -0400 Subject: applaunchd: update Flutter app systemd template unit Applications built with newer meta-flutter package their bundles in a directory hierarchy containing the Flutter SDK version and multiple runtime flavors (release, debug, profile). Rework our applaunchd systemd template unit to work with that. FLUTTER_VERSION and FLUTTER_RUNTIME environment variables are used in the ExecStart command line, with working defaults defined in the unit. The unit also includes sourcing a global /etc/default/flutter environment file as well as a per-application one to give us hooki for setting the version based on the value of FLUTTER_SDK_TAG in meta-agl-flutter. Bug-AGL: SPEC-4819 Change-Id: I4879760bfd9c01f29daf25d6cd4a3c70d07429fd Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28979 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../recipes-core/applaunchd/applaunchd/agl-app-flutter@.service | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-flutter@.service b/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-flutter@.service index c69c1862e..a9a2527e0 100644 --- a/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-flutter@.service +++ b/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-flutter@.service @@ -4,5 +4,9 @@ Description=%I [Service] Type=simple User=agl-driver +Environment=FLUTTER_VERSION=3.3.7 +Environment=FLUTTER_RUNTIME=release +EnvironmentFile=-/etc/default/flutter +EnvironmentFile=-/etc/default/%I Environment=XDG_RUNTIME_DIR=/run/user/1001/ -ExecStart=/usr/bin/flutter-auto --b=/usr/share/flutter/%I --xdg-shell-app-id=%I +ExecStart=/usr/bin/flutter-auto --b=/usr/share/flutter/%I/${FLUTTER_VERSION}/${FLUTTER_RUNTIME} --xdg-shell-app-id=%I -- cgit 1.2.3-korg