X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fpackagegroups%2Fpackagegroup-agl-demo-platform.bb;h=9c4553f29c88195d3a959cfd3a31242fc157224d;hb=bca788b0e5dc96ec8f8d3bf6ddf3fd0fd9c0f92c;hp=baffeb2966a55cfb282284f0ce5b6f1deae7c3a9;hpb=1b72a0f90fa7d1b45eb1017629cc83dcd8971c48;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index baffeb296..9c4553f29 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -23,30 +23,39 @@ RDEPENDS:${PN} += "\
     packagegroup-agl-demo \
     "
 
+AGL_APPS = " \
+    dashboard \
+    hvac \
+    ondemandnavi \
+    settings \
+    mediaplayer \
+    messaging \
+    phone \
+    radio \
+    "
+
+# Cluster demo support.
+CLUSTER_SUPPORT_PACKAGES = " \
+	tbtnavi \
+	cluster-demo-network-config \
+"
+CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-cluster-demo-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}"
 
-DEMO_UNIT_CONF ?= ""
 # Hook for demo platform configuration
 # ATM used for:
 # 1) Adding udev configuration and scripts for supporting USB attached
 #    I2C devices for RTC and HVAC LED support.
-DEMO_UNIT_CONF += " demo-i2c-udev-conf "
+DEMO_UNIT_CONF ?= "demo-i2c-udev-conf"
 
 # Preload only if agl-demo-preload is set
-DEMO_PRELOAD = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", " ${DEMO_UNIT_CONF} poiapp-api-key", "",d)}"
+DEMO_PRELOAD = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "${DEMO_UNIT_CONF}", "",d)}"
 
 RDEPENDS:${PN}:append = " \
-    weston-ini-conf \
+    launcher \
     qtquickcontrols2-agl \
     qtquickcontrols2-agl-style \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip mpc' , '', d)} \
+    ${AGL_APPS} \
+    ${CLUSTER_SUPPORT} \
     ${DEMO_PRELOAD} \
     "
-
-# NOTE: Currently no coverage versions for the application widgets,
-#       they should be added here when available.
-#       Also, the navigation and mixer debug widgets are currently
-#       specified explicitly, as there's no simple way to derive their
-#       names from the virtual/ RPROVIDES at present.
-RDEPENDS:${PN}-devel = " \
-    packagegroup-hmi-framework-devel \
-    "