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)} \
"