X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fimages%2Fagl-cluster-demo-platform-flutter.bb;h=6cdafb642808e778287725fddf2c29463ec1dbf9;hb=205758c8d7be87386ab094c0d8b76aa831ef8837;hp=07555fd8905d8140e750b2b6c2c9b19771a763ff;hpb=f8eb43810177a33d2fb414341e31caa0ae75bdfe;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb
index 07555fd89..6cdafb642 100644
--- a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb
+++ b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb
@@ -2,29 +2,35 @@ SUMMARY = "Baseline Flutter Image for Release"
 
 LICENSE = "MIT"
 
+require recipes-platform/images/agl-image-compositor.bb
 
-require recipes-platform/images/agl-image-weston.inc
+IMAGE_FEATURES += "splash package-management ssh-server-openssh"
+
+# Break out KUKSA.val packages, as demo unit configuration
+# points at KUKSA.val server on the IVI board in full demo
+# builds with the "agl-demo-preload" feature enabled.
+IMAGE_KUKSA_PACKAGES = " \
+    packagegroup-agl-kuksa-val-databroker \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \
+"
 
 # generic
-IMAGE_INSTALL:append = "\
-    agl-compositor \
-    agl-compositor-init \
-    packagegroup-agl-profile-graphical \
+IMAGE_INSTALL += "\
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "weston-ini-conf-landscape-inverted", "weston-ini-conf-landscape", d)} \
     \
-    kuksa-val \
-    kuksa-val-agl \
-    kuksa-dbc-feeder \
+    packagegroup-agl-networking \
+    cluster-receiver \
     \
-    kuksa-vss-init \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "${IMAGE_KUKSA_PACKAGES}", d)} \
     simple-can-simulator \
     "
 
-# flutter
-IMAGE_INSTALL:append = "\
-    weston-ini-conf-landscape \
-    \
-    flutter-cluster-dashboard-runtimerelease \
-    flutter-auto-runtimerelease \
+# Flutter
+IMAGE_INSTALL += "\
+    flutter-cluster-dashboard \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "flutter-cluster-dashboard-conf-demo", "flutter-cluster-dashboard-conf", d)} \
+    cluster-demo-config-flutter \
+    flutter-auto \
     "
 
 CLANGSDK = "1"