X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fimages%2Fagl-cluster-demo-platform-flutter.bb;h=735bb3145ca20ac80c5c11d004304c5e3dc38070;hb=d220137c7a7f1499237dadde11f29df111fbc591;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..735bb3145 100644
--- a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb
+++ b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb
@@ -2,28 +2,40 @@ SUMMARY = "Baseline Flutter Image for Release"
 
 LICENSE = "MIT"
 
-
 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 instead of
+# running the full stack locally.
+IMAGE_KUKSA_PACKAGES = " \
+    kuksa-val \
+    kuksa-val-agl \
+    kuksa-certificates-agl \
+    kuksa-dbc-feeder \
+    kuksa-vss-init \
+"
+
 # generic
 IMAGE_INSTALL:append = "\
     agl-compositor \
     agl-compositor-init \
-    packagegroup-agl-profile-graphical \
+    ${@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-profile-graphical \
+    packagegroup-agl-networking \
+    cluster-receiver \
     \
-    kuksa-vss-init \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "${IMAGE_KUKSA_PACKAGES}", d)} \
     simple-can-simulator \
     "
 
-# flutter
+# Flutter
 IMAGE_INSTALL:append = "\
-    weston-ini-conf-landscape \
-    \
-    flutter-cluster-dashboard-runtimerelease \
+    flutter-cluster-dashboard \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "cluster-demo-config-flutter", "", d)} \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "flutter-cluster-dashboard-conf-demo", "flutter-cluster-dashboard-conf", d)} \
     flutter-auto-runtimerelease \
     "