summaryrefslogtreecommitdiffstats
path: root/meta-agl-flutter/recipes-platform
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2023-06-06 17:06:54 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-06-12 11:10:26 +0000
commit83bbf82c41de1d532a920fa42326c17f40ea172f (patch)
treefaadb04910185130d74f367cbb9407c77f7993c8 /meta-agl-flutter/recipes-platform
parent0ccbb175eb5efdb59d0231198b295a21e3c466db (diff)
meta-agl-flutter: update for meta-agl-core changes
Changes: - Pull in image .bb files instead of .inc files. - Use agl-image-compositor as the base image for agl-image-flutter. instead of the appending done to agl-image-weston and its packagegroup previously. - Rework flutter-gallery systemd unit to work again, and update our bbappend to install it as disabled as an option for starting up flutter-gallery in agl-image-flutter. It seems useful to keep it present to serve as an example of starting Flutter apps via systemd and using the agl-flutter-env package. - Some minor documentation updates in README.md. - Replace some :append usage with += to avoid creating problems for downstream users. Bug-AGL: SPEC-4813 Change-Id: I8a61d6365ce69ac50b88abc7bc451486b3e1b339 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'meta-agl-flutter/recipes-platform')
-rw-r--r--meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb9
-rw-r--r--meta-agl-flutter/recipes-platform/images/agl-image-flutter.inc9
-rw-r--r--meta-agl-flutter/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend1
-rw-r--r--meta-agl-flutter/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_aglflutter.inc5
4 files changed, 5 insertions, 19 deletions
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 37b0f4e6..8263c0ae 100644
--- a/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb
+++ b/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb
@@ -1,10 +1,11 @@
-SUMMARY = "Baseline Flutter Image for Development"
+require recipes-platform/images/agl-image-compositor.bb
+SUMMARY = "Baseline Flutter Image for Development"
LICENSE = "MIT"
-require agl-image-flutter.inc
+CLANGSDK = "1"
-IMAGE_INSTALL:append = "\
+IMAGE_INSTALL += "\
weston-ini-conf-landscape \
\
flutter-auto-with-logging \
@@ -17,6 +18,6 @@ IMAGE_INSTALL:append = "\
\
"
-IMAGE_FEATURES:append = "\
+IMAGE_FEATURES += "\
ssh-server-openssh \
"
diff --git a/meta-agl-flutter/recipes-platform/images/agl-image-flutter.inc b/meta-agl-flutter/recipes-platform/images/agl-image-flutter.inc
deleted file mode 100644
index defa5d27..00000000
--- a/meta-agl-flutter/recipes-platform/images/agl-image-flutter.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-require recipes-platform/images/agl-image-weston.inc
-
-IMAGE_INSTALL:append = "\
- agl-compositor \
- agl-compositor-init \
- packagegroup-agl-profile-graphical \
- "
-
-CLANGSDK = "1"
diff --git a/meta-agl-flutter/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend b/meta-agl-flutter/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend
deleted file mode 100644
index cd322729..00000000
--- a/meta-agl-flutter/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('AGL_FEATURES', 'agl-flutter', 'packagegroup-agl-graphical-weston_aglflutter.inc', '', d)}
diff --git a/meta-agl-flutter/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_aglflutter.inc b/meta-agl-flutter/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_aglflutter.inc
deleted file mode 100644
index 2b91c177..00000000
--- a/meta-agl-flutter/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_aglflutter.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-RDEPENDS:${PN}:remove = "weston-init"
-
-RDEPENDS:${PN} += " \
- agl-compositor-init \
- "