From cce52591f8e00ae41ae380a597d620b0856d004d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 2 Jun 2023 10:52:32 -0400 Subject: Do not hard-code Flutter version and runtime type Rework the flutter-homescreen and flutter-cluster-dashboard systemd units to get the Flutter version and runtime type from the environment file installed by the new agl-flutter-env recipe, and update their JSON configuration files to remove the hardcoding of their bundle paths. Bug-AGL: SPEC-4819 Change-Id: I841db2cbb3acfe4aad173e9b8aa25ff2e201c2e2 Signed-off-by: Scott Murray --- .../flutter-cluster-dashboard/files/flutter-cluster-dashboard.service | 4 +++- .../files/flutter_cluster_dashboard_on_bg.json | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-demo/flutter-cluster-dashboard/files') diff --git a/recipes-demo/flutter-cluster-dashboard/files/flutter-cluster-dashboard.service b/recipes-demo/flutter-cluster-dashboard/files/flutter-cluster-dashboard.service index 71ab791dd..b79092e28 100644 --- a/recipes-demo/flutter-cluster-dashboard/files/flutter-cluster-dashboard.service +++ b/recipes-demo/flutter-cluster-dashboard/files/flutter-cluster-dashboard.service @@ -3,7 +3,9 @@ Requires=agl-compositor.service After=agl-compositor.service [Service] -ExecStart=/usr/bin/flutter-auto --j=/usr/share/flutter/default.json +EnvironmentFile=/etc/default/flutter +EnvironmentFile=-/etc/default/flutter-cluster-dashboard +ExecStart=/usr/bin/flutter-auto --b=/usr/share/flutter/flutter_cluster_dashboard/${FLUTTER_VERSION}/${FLUTTER_RUNTIME} --j=/usr/share/flutter/flutter-cluster-dashboard.json Restart=on-failure [Install] diff --git a/recipes-demo/flutter-cluster-dashboard/files/flutter_cluster_dashboard_on_bg.json b/recipes-demo/flutter-cluster-dashboard/files/flutter_cluster_dashboard_on_bg.json index 4bd7429a3..c90e5e3ae 100644 --- a/recipes-demo/flutter-cluster-dashboard/files/flutter_cluster_dashboard_on_bg.json +++ b/recipes-demo/flutter-cluster-dashboard/files/flutter_cluster_dashboard_on_bg.json @@ -2,7 +2,6 @@ "view": [ { "window_type": "BG", - "bundle_path": "/usr/share/flutter/flutter_cluster_dashboard/3.3.7/release", "width": 1920, "height": 1080, "fullscreen": true -- cgit 1.2.3-korg