From 04d305fc532c6bc7c0d2b923fa51737009d7dd5f Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Tue, 25 Jun 2024 10:53:28 -0400
Subject: meta-agl-flutter: rework agl-image-flutter

Rework agl-image-flutter to serve more as an example of including
a Flutter application into a production image, while also keeping
it being somewhat of a bit of a build smoketest for meta-flutter
integration.

Changes:
- Switch agl-image-flutter over to using the release version of
  the Flutter engine, and dropping the SDK, dev, and test packages.
- Re-enable having the gallery application get auto-started.
- Add a "-debug" version of the image that keeps most of the dev
  bits from the previous agl-image-flutter, and bakes in stuff
  like package management and debug tools.  This keeps an example
  of how such an image can be built, and will still work in the
  standalone case when agl-devel is not used.

Bug-AGL: SPEC-5182

Change-Id: Ib6abecc678dcebc52ad0bc4e67bcc07278fe57ed
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 .../flutter-apps/flutter-gallery_aglflutter.inc    |  5 ----
 .../images/agl-image-flutter-debug.bb              | 29 ++++++++++++++++++++++
 .../recipes-platform/images/agl-image-flutter.bb   | 16 ++++--------
 3 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 meta-agl-flutter/recipes-platform/images/agl-image-flutter-debug.bb

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 4be748d1..f738cdb0 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
@@ -12,11 +12,6 @@ do_install:append() {
     install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service
 }
 
-#FILES:${PN} += "${systemd_system_unitdir}"
-
 RDEPENDS:${PN} += "agl-flutter-env"
 
 SYSTEMD_SERVICE:${PN} = "flutter-gallery.service"
-# Explicitly disable auto-start to avoid interferring with Toyota workspace
-# tooling usecase.
-SYSTEMD_AUTO_ENABLE:${PN} = "disable"
diff --git a/meta-agl-flutter/recipes-platform/images/agl-image-flutter-debug.bb b/meta-agl-flutter/recipes-platform/images/agl-image-flutter-debug.bb
new file mode 100644
index 00000000..c9c1f298
--- /dev/null
+++ b/meta-agl-flutter/recipes-platform/images/agl-image-flutter-debug.bb
@@ -0,0 +1,29 @@
+require recipes-platform/images/agl-image-compositor.bb
+
+SUMMARY = "Example Flutter application debug image for development"
+LICENSE = "MIT"
+
+CLANGSDK = "1"
+
+# NOTES:
+# - the package-management IMAGE_FEATURE and packagegroup-agl-core-devel
+#   are explicitly added here to cover the usecase of building without
+#   passing agl-devel to aglsetup.sh.  This is explicitly a debug image
+#   where those are are always desired.
+# - Getting the debug version of the application requires changing
+#   the value of FLUTTER_APP_RUNTIME_MODES to include "debug",
+#   which is outside the scope of this image recipe.
+
+IMAGE_FEATURES += "ssh-server-openssh package-management dbg-pkgs"
+
+IMAGE_INSTALL += "\
+    packagegroup-agl-core-devel \
+    \
+    weston-ini-conf-landscape \
+    \
+    flutter-auto-verbose-logs \
+    \
+    flutter-engine-sdk-dev \
+    \
+    flutter-gallery \
+"
diff --git a/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb b/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb
index 697bca3e..0fdb7da0 100644
--- a/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb
+++ b/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb
@@ -1,22 +1,16 @@
 require recipes-platform/images/agl-image-compositor.bb
 
-SUMMARY = "Baseline Flutter Image for Development"
+SUMMARY = "Example Flutter application image"
 LICENSE = "MIT"
 
 CLANGSDK = "1"
 
+IMAGE_FEATURES += "ssh-server-openssh"
+
 IMAGE_INSTALL += "\
     weston-ini-conf-landscape \
     \
-    flutter-auto-verbose-logs \
-    \
-    flutter-engine-sdk-dev \
+    flutter-auto \
     \
     flutter-gallery \
-    flutter-test-texture-egl \
-    \
-    "
-
-IMAGE_FEATURES += "\
-    ssh-server-openssh \
-    "
+"
-- 
cgit 1.2.3-korg