summaryrefslogtreecommitdiffstats
path: root/meta-agl-flutter/recipes-platform
diff options
context:
space:
mode:
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 \
- "