Code Review
/
AGL
/
meta-agl-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Cleanup post next merge
[AGL/meta-agl-demo.git]
/
recipes-platform
/
packagegroups
/
packagegroup-agl-demo-platform.bb
diff --git
a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index
80ad559
..
d72112b
100644
(file)
--- a/
recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/
recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@
-31,12
+31,11
@@
AGL_APPS = " \
radio \
settings \
messaging \
radio \
settings \
messaging \
- ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'taskmanager' , '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \
- high-level-viwi-service \
- agl-service-signal-composer \
low-can-demo \
virtual/mixer \
low-can-demo \
virtual/mixer \
+ ${@bb.utils.contains('IMAGE_FEATURES', 'agl-voiceagent-alexa', 'alexa-viewer' , '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'taskmanager' , '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \
"
QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras", "",d)}"
"
QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras", "",d)}"
@@
-44,11
+43,7
@@
QTAGLEXTRAS_append = " libqtappfw"
# add support for websocket in Qt and QML
QTAGLEXTRAS_append = " qtwebsockets qtwebsockets-qmlplugins"
# add support for websocket in Qt and QML
QTAGLEXTRAS_append = " qtwebsockets qtwebsockets-qmlplugins"
-PREFERRED_PROVIDER_virtual/webruntime = "web-runtime"
-
-#QTAGLEXTRAS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'qtwebengine', '', d)}"
-#QTAGLEXTRAS_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles"
-#IMAGE_INSTALL_append = " qtwebengine-examples"
+#PREFERRED_PROVIDER_virtual/webruntime = "web-runtime"
# packages from hmi-framework aka homescreen-2017
HOMESCREEN = "packagegroup-hmi-framework"
# packages from hmi-framework aka homescreen-2017
HOMESCREEN = "packagegroup-hmi-framework"
@@
-60,14
+55,16
@@
CLUSTER_SUPPORT_PACKAGES = " \
${MAPVIEWER} \
cluster-demo-network-config \
cluster-lin-bridging-config \
${MAPVIEWER} \
cluster-demo-network-config \
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("DISTRO_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.
# 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_
PLATFORM_CONF
= " demo-i2c-udev-conf "
+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.
# Preload poi API key for demo if requested, and potentially maps for older
# navigation application if it is configured.
@@
-75,7
+72,7
@@
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_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_
PLATFORM
_CONF} poiapp-api-key", "",d)}"
+DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", " ${DEMO_PRELOAD_MAPS} ${DEMO_
UNIT
_CONF} poiapp-api-key", "",d)}"
RDEPENDS_${PN}_append = " \
RDEPENDS_${PN}_append = " \