From 3cfd33f931d4154ee6afd1b4cc0a6598927545b6 Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Tue, 6 Sep 2022 17:02:55 -0700 Subject: meta-agl-flutter updates -layer README -flutter workspace configuration file -consolidation of gallery json files -remove flutter sdk version pin; now happens upstream -add engine_sdk.zip to all images (non-production) -add SSH server to debug and profile images -factor out flutter-auto xdg-shell-app-id patch Signed-off-by: Joel Winarske Change-Id: I6fdf1277bb4011126103f74eda5e230f34f497d7 (cherry picked from commit ee6873ad9024399cc69f81bab2745eb3a0bb3649) --- .../flutter-apps/flutter-gallery/flutter-gallery.service | 2 +- .../flutter-apps/flutter-gallery/gallery_on_bg-debug.json | 11 ----------- .../flutter-apps/flutter-gallery/gallery_on_bg-profile.json | 11 ----------- .../flutter-apps/flutter-gallery/gallery_on_bg-release.json | 10 ---------- .../flutter-apps/flutter-gallery_aglflutter.inc | 11 ----------- 5 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-debug.json delete mode 100644 meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-profile.json delete mode 100644 meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-release.json (limited to 'meta-agl-flutter/recipes-graphics/flutter-apps') diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service index 71ab791d..3d4ecbf1 100644 --- a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service +++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service @@ -3,7 +3,7 @@ Requires=agl-compositor.service After=agl-compositor.service [Service] -ExecStart=/usr/bin/flutter-auto --j=/usr/share/flutter/default.json +ExecStart=/usr/bin/flutter-auto --j=/usr/share/flutter/default.json --b=/usr/share/flutter/gallery --f Restart=on-failure [Install] diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-debug.json b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-debug.json deleted file mode 100644 index 5a84a0bd..00000000 --- a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-debug.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "view" : [ { - "window_type" : "BG", - "bundle_path" : "/usr/share/flutter/gallery", - "vm_args":["--observatory-host", "0.0.0.0", "--observatory-port", "1234"], - "width" : 1920, - "height": 1080, - "fullscreen": true - } - ] -} diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-profile.json b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-profile.json deleted file mode 100644 index 3309fde4..00000000 --- a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-profile.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "view" : [ { - "window_type" : "BG", - "bundle_path" : "/usr/share/flutter/gallery", - "vm_args":["--observatory-host", "0.0.0.0", "--observatory-port", "1234", "--start-paused"], - "width" : 1920, - "height": 1080, - "fullscreen": true - } - ] -} diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-release.json b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-release.json deleted file mode 100644 index 6a2a8448..00000000 --- a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-release.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "view" : [ { - "window_type" : "BG", - "bundle_path" : "/usr/share/flutter/gallery", - "width" : 1920, - "height": 1080, - "fullscreen": true - } - ] -} 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 533bdd71..c618a2fe 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 @@ -2,15 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/flutter-gallery:" SRC_URI += " \ file://flutter-gallery.service \ - file://gallery_on_bg-debug.json \ - file://gallery_on_bg-profile.json \ - file://gallery_on_bg-release.json \ " -APP_CONFIG = "gallery_on_bg-release.json" -APP_CONFIG:class-runtimedebug = "gallery_on_bg-debug.json" -APP_CONFIG:class-runtimeprofile = "gallery_on_bg-profile.json" - # To avoid conflicts with the systemd template scheme added via bbappend in # meta-agl-demo, package the standalone systemd unit separately. This is not # needed when meta-agl-flutter is used without meta-agl-demo, but that is not @@ -26,14 +19,10 @@ do_install:append() { install -D -m 0644 ${WORKDIR}/flutter-gallery.service ${D}${systemd_user_unitdir}/flutter-gallery.service install -d ${D}${systemd_user_unitdir}/agl-session.target.wants ln -s ../flutter-gallery.service ${D}${systemd_user_unitdir}/agl-session.target.wants/flutter-gallery.service - - install -D -m 0644 ${WORKDIR}/${APP_CONFIG} ${D}${datadir}/flutter/default.json } PACKAGE_BEFORE_PN += "${PN}-init" -FILES:${PN} += "${datadir}" - FILES:${PN}-init = "${systemd_user_unitdir}" RDEPENDS:${PN}-init = "${PN}" \ No newline at end of file -- cgit 1.2.3-korg