X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fpackagegroups%2Fpackagegroup-agl-demo-platform.bb;h=a9740509dd0664bf6f047b23aa1096970256f9ed;hb=172e7986d54e865278373b8b72a996ed2c5ccbfe;hp=4ab64d0bb49282b9640675a38614e78d9f9daf82;hpb=b6852864508358930586e083e72cd2912af68674;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 4ab64d0bb..a9740509d 100755
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -20,13 +20,10 @@ RDEPENDS_${PN} += "\
     packagegroup-agl-demo \
     "
 
-MOST_DRIVERS = " "
-MOST_DRIVERS_append_BROKENonIntelQemuRpi3 = " \
-    mocca-usb \
+MOST_DRIVERS = " \
     most \
     "
-# Don't add MOST support when building for Porter
-MOST_DRIVERS_remove_porter = "most"
+MOST_DRIVERS_append_m3ulcb = " sllin"
 
 # HVAC dependencies depend on drivers above
 MOST_HVAC = " "
@@ -36,27 +33,24 @@ MOST_HVAC_append = " \
     agl-service-unicens \
     "
 
-# can-lin is a binary and only for porter :(
-MOST_HVAC_append_porter = " \
-    can-lin \
-    "
-
-# mapviewer and mapviewer-demo requires AGL CES2017 demo mock-up
-MAPVIEWER = "${@bb.utils.contains("DISTRO_FEATURES", "agl-mapviewer-demo", " mapviewer mapviewer-demo", "",d)}"
+# @Chris: This needs to be checked!
+MOST_HVAC_dra7xx-evm = ""
+MOST_HVAC_dragonboard-410c = ""
 
 AGL_APPS = " \
     dashboard \
     hvac \
     mediaplayer \
-    mixer \
     virtual/navigation \
     phone \
     poiapp \
     radio \
     settings \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'taskmanager' , '', d)} \
     high-level-viwi-service \
     agl-service-signal-composer \
     low-can-demo \
+    virtual/mixer \
     "
 
 AGL_APIS = " \
@@ -65,15 +59,29 @@ AGL_APIS = " \
 
 QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras", "",d)}"
 
+# mapviewer and mapviewer-demo are required for AGL cluster demo
+MAPVIEWER = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-support", " mapviewer mapviewer-demo", "",d)}"
+
+# Preload navigation maps and poi API key for demo if requested
+DEMO_MAPS_LOCALE ?= "uk"
+DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", " navigation-maps-${DEMO_MAPS_LOCALE} poiapp-api-key", "",d)}"
+
+# Hook for demo platform configuration
+# ATM, only used to disable btwilink module on M3ULCB + Kingfisher by default,
+# setting DEMO_ENABLE_BTWILINK to "true" in local.conf / site.conf re-enables.
+DEMO_ENABLE_BTWILINK ?= ""
+DEMO_PLATFORM_CONF = ""
+DEMO_PLATFORM_CONF_append_m3ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", "true", "", " btwilink-disable-conf", d)}"
+
 RDEPENDS_${PN}_append = " \
     qtquickcontrols2-agl \
     qtquickcontrols2-agl-style \
     linux-firmware-ralink \
-    ${QTAGLEXTRAS} \
-    ${MAPVIEWER} \
     ${MOST_HVAC} \
     ${AGL_APPS} \
     ${AGL_APIS} \
+    ${QTAGLEXTRAS} \
+    ${MAPVIEWER} \
+    ${DEMO_PRELOAD} \
+    ${DEMO_PLATFORM_CONF} \
     "
-
-