From 33cdbee53ea3ec3d2f88e05744ea9e6611c40772 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 4 Aug 2022 16:53:39 -0400
Subject: meta-agl-flutter: Simplify AGL integration

Changes:
- Remove Igalia homescreen and Pumped Fuel app recipes since they
  duplicate what is in meta-flutter.  Now that there is a AGL
  Flutter demo image in meta-agl, any recipes or bbappends for
  apps should go there except for the flutter-gallery integration
  for agl-image-flutter (see below).
- Move flutter-gallery systemd unit changes out of flutter-auto
  bbappend to a new flutter-gallery bbappend to simplify using
  flutter-auto on its own.  To facilitate interoperation with the
  use of flutter-gallery in the agl-ivi-demo-platform-flutter image,
  the systemd files are split out into a -init package that has been
  added to agl-image-flutter.
- Added back a reworked version of the app-id command-line option
  patch in the flutter-auto bbappend with the option changed to
  --xdg-shell-app-id per upstream request.  This wil be submitted
  upstream as time permits.  The merged patches that were deleted have
  been removed from SRC_URI.

The intent of the above is to move to meta-agl-flutter just having the
minimal set of changes to integrate flutter-auto with AGL use, with
the agl-image-flutter image kept as a simple smoketest / example.

Bug-AGL: SPEC-4485

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I171852820be404774d7580778643c801e8fad34f
---
 .../toyota/flutter-auto_aglflutter.inc             | 47 +++-------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

(limited to 'meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc')

diff --git a/meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc b/meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc
index 4baaa517..0b580c2a 100644
--- a/meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc
+++ b/meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc
@@ -1,47 +1,12 @@
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
+
+SRC_URI += " \
+    file://0001-Add-xdg-shell-app-id-command-line-argument.patch \
+"
+
 # For now disable gstreamer to avoid needing to enable "commercial"
 # licenses for the stated ffmpeg dependency.
 PACKAGECONFIG:remove = "gstreamer"
 
 # Enable verbose logging on runtimedebug image
 PACKAGECONFIG:append:runtimedebug = "verbose"
-
-
-USER_SERVICE = "flutter-auto.service"
-
-FILESEXTRAPATHS:append := "${THISDIR}/files:"
-SRC_URI += "\
-    file://${USER_SERVICE} \
-    file://gallery_on_bg-debug.json \
-    file://gallery_on_bg-profile.json \
-    file://gallery_on_bg-release.json \
-    file://0002-shell-configuration-Obey-json-configuration-file.patch \
-    file://0003-shell-configuration-Fixes-to-general-options.patch \
-    file://0004-Add-app-id-command-line-argument.patch \
-    "
-
-
-cmake_do_install:append() {
-
-    install -d ${D}${systemd_user_unitdir}/agl-session.target.wants
-    install -D -m0644 ${WORKDIR}/${USER_SERVICE} ${D}${systemd_user_unitdir}/${USER_SERVICE}
-
-    install -D -m0644 ${WORKDIR}/gallery_on_bg-release.json ${D}${datadir}/flutter/default.json
-}
-
-cmake_do_install:append:runtimedebug() {
-
-    # the dev host controls starting/stopping the flutter-auto process when runtime=debug
-    install -D -m0644 ${WORKDIR}/gallery_on_bg-debug.json ${D}${datadir}/flutter/default.json
-}
-
-cmake_do_install:append:runtimeprofile() {
-
-    # the dev host controls starting/stopping the flutter-auto process when runtime=profile
-    install -D -m0644 ${WORKDIR}/gallery_on_bg-profile.json ${D}${datadir}/flutter/default.json
-}
-
-
-FILES:${PN} += "\
-    ${systemd_user_unitdir} \
-    ${datadir} \
-    "
-- 
cgit 1.2.3-korg