Update Flutter demo images

Changes:
- Split demo image feature definitions into an include file to
  allow reusing them, and pull into both the Qt and Flutter demo
  platform images.
- Remove packagegroup-agl-demo-platform dependencies from feature
  packagegroups so they will not break the Flutter images.
- Tweak Flutter cluster demo image to have KUKSA.val related
  package omission be controlled by the "agl-demo-preload"
  feature.
- Add the kuksa-vss-init package to the IVI services packagegroup
  so that the signal initialization expected by the Flutter cluster
  dashboard will always be done.  This covers the usecase of using
  the Flutter cluster with KUKSA.val on the IVI board.
- Add missing "agl-demo-preload" tweaks from the Qt demo platform
  image to the Flutter one.
- Tweak things to leave out the Weston terminal app from images
  build with the "agl-demo-preload" feature.
- Remove flutter-navigation and flutter-mediaplayer from the
  Flutter demo image for now, and add the messaging, phone, and
  radio Qt apps to fill out the list of apps for the demo.

Bug-AGL: SPEC-4636, SPEC-4637, SPEC-4639

Change-Id: I9cde89278f0191886152f765d4fb1a893c0ea2c1
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

5 files changed, 7 insertions, 8 deletions

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb
index 9836207f0..f64ea4721 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb
@@ -10,7 +10,6 @@ PACKAGES = "\
 "
 
 RDEPENDS:${PN} += "\
-    packagegroup-agl-demo-platform \
     tbtnavi \
     kuksa-val-agl-demo-cluster \
 "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
index 76bff18c4..4e290e32b 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
@@ -19,13 +19,14 @@ RDEPENDS:${PN} += "\
 AGL_FLUTTER_RUNTIME ?= "runtimerelease"
 
 AGL_APPS = " \
+    flutter-dashboard-${AGL_FLUTTER_RUNTIME} \ \
+    flutter-hvac-${AGL_FLUTTER_RUNTIME} \ \
+    ondemandnavi \
     settings \
     mediaplayer \
-    ondemandnavi \
-    flutter-dashboard-${AGL_FLUTTER_RUNTIME} \
-    flutter-hvac-${AGL_FLUTTER_RUNTIME} \
-    flutter-mediaplayer-${AGL_FLUTTER_RUNTIME} \
-    flutter-nav-${AGL_FLUTTER_RUNTIME} \
+    messaging \
+    phone \
+    radio \
     "
 
 RDEPENDS:${PN}:append = " \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-preload.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-preload.bb
index 2facd00f6..808c93c67 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-preload.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-preload.bb
@@ -18,7 +18,6 @@ PACKAGES = " \
 #     the steering wheel used in the demo setup.
 #
 RDEPENDS:${PN} = "\
-    packagegroup-agl-demo-platform \
     demo-i2c-udev-conf \
     simple-can-simulator \
 "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
index 8bcd63f8a..2b91c177d 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
+++ b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
@@ -2,5 +2,4 @@ RDEPENDS:${PN}:remove = "weston-init"
 
 RDEPENDS:${PN} += " \
                   agl-compositor-init \
-                  weston-terminal-conf \
                   "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
index 6d2f6546e..2e6fff408 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
@@ -11,6 +11,7 @@ RDEPENDS:${PN} += "\
     kuksa-val \
     kuksa-val-agl \
     kuksa-dbc-feeder \
+    kuksa-vss-init \
     agl-service-hvac \
     agl-service-audiomixer \
     "