From cce52591f8e00ae41ae380a597d620b0856d004d Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
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 <scott.murray@konsulko.com>
---
 recipes-demo/flutter-homescreen/files/flutter-homescreen.json    | 1 -
 recipes-demo/flutter-homescreen/files/flutter-homescreen.service | 4 +++-
 recipes-demo/flutter-homescreen/flutter-homescreen_git.bb        | 9 +++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'recipes-demo/flutter-homescreen')

diff --git a/recipes-demo/flutter-homescreen/files/flutter-homescreen.json b/recipes-demo/flutter-homescreen/files/flutter-homescreen.json
index 29308d3e..63babcfa 100644
--- a/recipes-demo/flutter-homescreen/files/flutter-homescreen.json
+++ b/recipes-demo/flutter-homescreen/files/flutter-homescreen.json
@@ -1,7 +1,6 @@
 {
         "view" : [ {
                 "window_type" : "BG",
-                "bundle_path" : "/usr/share/flutter/flutter_homescreen/3.3.7/release",
                 "width" : 1920,
                 "height": 1080,
                 "fullscreen": true
diff --git a/recipes-demo/flutter-homescreen/files/flutter-homescreen.service b/recipes-demo/flutter-homescreen/files/flutter-homescreen.service
index 300fb22d..a57fc5cc 100644
--- a/recipes-demo/flutter-homescreen/files/flutter-homescreen.service
+++ b/recipes-demo/flutter-homescreen/files/flutter-homescreen.service
@@ -3,7 +3,9 @@ Requires=agl-compositor.service
 After=agl-compositor.service
 
 [Service]
-ExecStart=/usr/bin/flutter-auto --j=/usr/share/flutter/flutter-homescreen.json --xdg-shell-app-id=homescreen
+EnvironmentFile=/etc/default/flutter
+EnvironmentFile=-/etc/default/flutter-homescreen
+ExecStart=/usr/bin/flutter-auto --b=/usr/share/flutter/flutter_homescreen/${FLUTTER_VERSION}/${FLUTTER_RUNTIME} --j=/usr/share/flutter/flutter-homescreen.json --xdg-shell-app-id=homescreen
 Restart=on-failure
 
 [Install]
diff --git a/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb b/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb
index c4142774..0bd1ae19 100644
--- a/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb
+++ b/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb
@@ -22,17 +22,18 @@ FLUTTER_BUILD_ARGS = "bundle -v"
 
 inherit flutter-app
 
-APP_CONFIG = "flutter-homescreen.json"
+APP_CONFIG = "${BPN}.json"
 
 do_install:append() {
-    install -D -m 0644 ${WORKDIR}/flutter-homescreen.service ${D}${systemd_user_unitdir}/flutter-homescreen.service
+    install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_user_unitdir}/${BPN}.service
     install -d ${D}${systemd_user_unitdir}/agl-session.target.wants
-    ln -s ../flutter-homescreen.service ${D}${systemd_user_unitdir}/agl-session.target.wants/flutter-homescreen.service
+    ln -s ../${BPN}.service ${D}${systemd_user_unitdir}/agl-session.target.wants/${BPN}.service
 
-    install -D -m 0644 ${WORKDIR}/${APP_CONFIG} ${D}${datadir}/flutter/flutter-homescreen.json
+    install -D -m 0644 ${WORKDIR}/${APP_CONFIG} ${D}${datadir}/flutter/${BPN}.json
 
     install -d ${D}${sysconfdir}/xdg/AGL
     install -m 0644 ${WORKDIR}/homescreen_config.yaml ${D}${sysconfdir}/xdg/AGL/
 }
 
 FILES:${PN} += "${datadir} ${systemd_user_unitdir} ${sysconfdir}/xdg/AGL"
+RDEPENDS:${PN} += "flutter-auto agl-flutter-env"
-- 
cgit 1.2.3-korg