X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=recipes-platform%2Fpackagegroups%2Fpackagegroup-agl-demo-platform.bb;h=72e5d7a61b5d835cc33936c09f08b3dd988df683;hb=39c3ae23a452272dbec96fb95b5928856eb05c42;hp=812139b2e3f199c2e8f343698ed8721adb3dcefc;hpb=79473c2e7789d4887a449abad46732ed2b17f33d;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 812139b2e..72e5d7a61 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -34,7 +34,9 @@ AGL_APPS = " \
     settings \
     messaging \
     ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'taskmanager' , '', d)} \
+    ${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin' , '', d)} \
     virtual/mixer \
+    virtual/qtwayland-config \
     "
 
 QTAGLEXTRAS = " libqtappfw"
@@ -52,7 +54,7 @@ CLUSTER_SUPPORT_PACKAGES = " \
 	cluster-lin-bridging-config \
 	cluster-demo-simulator \
 "
-CLUSTER_SUPPORT = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}"
+CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-cluster-demo-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}"
 
 DEMO_UNIT_CONF ?= ""
 # Hook for demo platform configuration
@@ -61,15 +63,11 @@ DEMO_UNIT_CONF ?= ""
 #    I2C devices for RTC and HVAC LED support.
 DEMO_UNIT_CONF += " demo-i2c-udev-conf "
 
-# Preload poi API key for demo if requested, and potentially maps for older
-# navigation application if it is configured.
-DEMO_MAPS_LOCALE ?= "uk"
-DEMO_PRELOAD_MAPS = "${@bb.utils.contains("PREFERRED_RPROVIDER_virtual/navigation", "navigation", " navigation-maps-${DEMO_MAPS_LOCALE}", "",d)}"
-
 # Preload only if agl-demo-preload is set
-DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", " ${DEMO_PRELOAD_MAPS} ${DEMO_UNIT_CONF} poiapp-api-key", "",d)}"
+DEMO_PRELOAD = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", " ${DEMO_UNIT_CONF} poiapp-api-key", "",d)}"
 
 RDEPENDS_${PN}_append = " \
+    weston-ini-conf \
     qtquickcontrols2-agl \
     qtquickcontrols2-agl-style \
     ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \