X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fimages%2Fagl-ivi-demo-platform.bb;h=d860cd518a41e2fab1ce5edd913a04f8c935ae21;hb=205758c8d7be87386ab094c0d8b76aa831ef8837;hp=d3bda6ae5623a7a8acc950ab6dc0c57777e04bfc;hpb=78883948a2f9ee25ebc24c6fcfefd031d0d3cb6f;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-platform.bb
index d3bda6ae5..d860cd518 100644
--- a/recipes-platform/images/agl-ivi-demo-platform.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform.bb
@@ -1,15 +1,20 @@
 require agl-image-ivi.bb
 
-DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and \
-demos."
+DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and demos."
 
-FEATURE_PACKAGES_agl-demo-preload = "packagegroup-agl-demo-preload"
-FEATURE_PACKAGES_agl-demo-cluster-support = "packagegroup-agl-demo-cluster-support"
+require agl-demo-features.inc
+require agl-demo-container-guest-integration.inc
 
-IMAGE_FEATURES += "${@bb.utils.filter("AGL_FEATURES", "agl-demo-preload agl-demo-cluster-support", d)}"
+# Add packages for demo platform (include demo apps) here
 
-# add packages for demo platform (include demo apps) here
-IMAGE_INSTALL:append = " \
+AGL_DEVEL_INSTALL += "\
+    packagegroup-agl-kuksa-val-databroker-devel \
+    simple-can-simulator \
+"
+
+IMAGE_INSTALL += " \
     packagegroup-agl-demo-platform \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \
 "