From 28b6f10df1bb46d266463ffd7f4bc260644e14a2 Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Fri, 6 Sep 2024 08:44:38 -0700 Subject: Flutter SDK 3.24.2 -swap flutter-samples-material-3-demo for flutter-gallery -updated workspace-automation configs Change-Id: Ie5cc66f53d7880106e10a98560292a2c2625473c Signed-off-by: Joel Winarske Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30260 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller Reviewed-by: Scott Murray --- .../flutter-gallery/flutter-gallery.service | 13 ------------- .../first-party/flutter-gallery_%.bbappend | 1 - .../first-party/flutter-gallery_aglflutter.inc | 13 ------------- .../flutter-samples-material-3-demo.service | 13 +++++++++++++ .../flutter-samples-material-3-demo.toml | 5 +++++ .../flutter-samples-material-3-demo_%.bbappend | 1 + .../flutter-samples-material-3-demo_aglflutter.inc | 22 ++++++++++++++++++++++ 7 files changed, 41 insertions(+), 27 deletions(-) delete mode 100644 meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery/flutter-gallery.service delete mode 100644 meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_%.bbappend delete mode 100644 meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_aglflutter.inc create mode 100644 meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo/flutter-samples-material-3-demo.service create mode 100644 meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo/flutter-samples-material-3-demo.toml create mode 100644 meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo_%.bbappend create mode 100644 meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo_aglflutter.inc (limited to 'meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics') diff --git a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery/flutter-gallery.service b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery/flutter-gallery.service deleted file mode 100644 index 0b29c3f82..000000000 --- a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery/flutter-gallery.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Requires=agl-compositor.service -After=agl-compositor.service - -[Service] -User=agl-driver -EnvironmentFile=/etc/default/flutter -EnvironmentFile=-/etc/default/flutter-gallery -Environment=XDG_RUNTIME_DIR=/run/user/1001/ -ExecStart=/usr/bin/flutter-auto --b=/usr/share/flutter/flutter-gallery/${FLUTTER_VERSION}/${FLUTTER_RUNTIME} --f --window-type=BG --xdg-shell-app-id=flutter-gallery - -[Install] -WantedBy=graphical.target diff --git a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_%.bbappend b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_%.bbappend deleted file mode 100644 index 835e86e66..000000000 --- a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'agl-flutter', 'flutter-gallery_aglflutter.inc', '', d)} diff --git a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_aglflutter.inc b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_aglflutter.inc deleted file mode 100644 index 68c07f188..000000000 --- a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_aglflutter.inc +++ /dev/null @@ -1,13 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/flutter-gallery:" - -SRC_URI += "file://flutter-gallery.service" - -inherit systemd - -do_install:append() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service -} - -RDEPENDS:${PN} += "agl-flutter-env" - -SYSTEMD_SERVICE:${PN} = "flutter-gallery.service" diff --git a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo/flutter-samples-material-3-demo.service b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo/flutter-samples-material-3-demo.service new file mode 100644 index 000000000..f3f4a94b1 --- /dev/null +++ b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo/flutter-samples-material-3-demo.service @@ -0,0 +1,13 @@ +[Unit] +Requires=agl-compositor.service +After=agl-compositor.service + +[Service] +User=agl-driver +EnvironmentFile=/etc/default/flutter +EnvironmentFile=-/etc/default/flutter-samples-material-3-demo +Environment=XDG_RUNTIME_DIR=/run/user/1001/ +ExecStart=/usr/bin/flutter-auto -b /usr/share/flutter/flutter-samples-material-3-demo/${FLUTTER_VERSION}/${FLUTTER_RUNTIME} -xdg-shell-app-id flutter-samples-material-3-demo + +[Install] +WantedBy=graphical.target diff --git a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo/flutter-samples-material-3-demo.toml b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo/flutter-samples-material-3-demo.toml new file mode 100644 index 000000000..cb78ab0cd --- /dev/null +++ b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo/flutter-samples-material-3-demo.toml @@ -0,0 +1,5 @@ +[view] +window_type = "BG" +width = 1080 +height = 1920 +fullscreen = true diff --git a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo_%.bbappend b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo_%.bbappend new file mode 100644 index 000000000..0baa7a045 --- /dev/null +++ b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agl-flutter', 'flutter-samples-material-3-demo_aglflutter.inc', '', d)} diff --git a/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo_aglflutter.inc b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo_aglflutter.inc new file mode 100644 index 000000000..971756ad7 --- /dev/null +++ b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-samples-material-3-demo_aglflutter.inc @@ -0,0 +1,22 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/flutter-samples-material-3-demo:" + +SRC_URI += "file://flutter-samples-material-3-demo.service" + +APP_CONFIG = "flutter-samples-material-3-demo.toml" + +inherit systemd + +do_install:append() { + install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + + # determine build type based on what flutter-engine installed. + for runtime_mode in ${FLUTTER_RUNTIME_MODES} + do + install -D -m 0644 ${WORKDIR}/${APP_CONFIG} \ + ${D}${datadir}/flutter/${PUBSPEC_APPNAME}/${FLUTTER_SDK_VERSION}/${runtime_mode}/config.toml + done +} + +RDEPENDS:${PN} += "agl-flutter-env" + +SYSTEMD_SERVICE:${PN} = "flutter-samples-material-3-demo.service" -- cgit 1.2.3-korg