X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fpackagegroups%2Fpackagegroup-agl-demo-platform.bb;h=b6bda83b9be7f71c9da57e92bb96fd93678ef444;hb=130798b869fc81db7c48f515f1df7867ca591b4a;hp=3e54810835c34718055c7d7208be32b082509e07;hpb=7783a290e85c35e8e152dee8099f8defe2ca710d;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
old mode 100644
new mode 100755
index 3e5481083..b6bda83b9
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -16,64 +16,73 @@ RDEPENDS_${PN} += "\
     "
 
 RDEPENDS_${PN} += "\
+    packagegroup-agl-profile-graphical-qt5 \
     packagegroup-agl-demo \
     "
-    
-# add packages for CES2017 demo
-# Only for porter as these kernel module sources
-# are for the 3.10.x kernel only
-MOST_DRIVERS = " "
-MOST_DRIVERS_append = " \
-    aim-cdev \
-    aim-network \
-    aim-sound \
-    aim-v4l2 \
-    hdm-dim2 \
-    hdm-i2c \
-    hdm-usb \
-    mocca-usb \
-    mostcore \
+
+MOST_DRIVERS = " \
+    most \
     "
+MOST_DRIVERS_append_m3ulcb = " sllin"
 
 # HVAC dependencies depend on drivers above
 MOST_HVAC = " "
 MOST_HVAC_append = " \
     ${MOST_DRIVERS} \
-    unicens \
-    vod-server \
-    "
-
-# can-lin is a binary and only for porter :(
-MOST_HVAC_append_porter = " \
-    can-lin \
+    unicens-config \
+    agl-service-unicens \
+    agl-service-unicens-controller \
     "
 
-# mapviewer and mapviewer-demo requires AGL CES2017 demo mock-up
-MAPVIEWER = " "
-MAPVIEWER_append_porter = " \
-    mapviewer \
-    mapviewer-demo \
-    "
+# @Chris: This needs to be checked!
+MOST_HVAC_dra7xx-evm = ""
+MOST_HVAC_dragonboard-410c = ""
 
 AGL_APPS = " \
-    controls \
     dashboard \
     hvac \
     mediaplayer \
-    mixer \
-    navigation \
+    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 = " \
+    libnaviapi-agl \
+    "
+
+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 = " \
-    ces2017-demo \
+    qtquickcontrols2-agl \
+    qtquickcontrols2-agl-style \
     linux-firmware-ralink \
-    ${MAPVIEWER} \
     ${MOST_HVAC} \
     ${AGL_APPS} \
+    ${AGL_APIS} \
+    ${QTAGLEXTRAS} \
+    ${MAPVIEWER} \
+    ${DEMO_PRELOAD} \
+    ${DEMO_PLATFORM_CONF} \
     "
-
-