diff options
Diffstat (limited to 'meta-agl-demo/recipes-platform')
10 files changed, 189 insertions, 59 deletions
diff --git a/meta-agl-demo/recipes-platform/images/agl-demo-platform-crosssdk.bb b/meta-agl-demo/recipes-platform/images/agl-demo-platform-crosssdk.bb index 088b4cc4..a814b694 100755 --- a/meta-agl-demo/recipes-platform/images/agl-demo-platform-crosssdk.bb +++ b/meta-agl-demo/recipes-platform/images/agl-demo-platform-crosssdk.bb @@ -63,3 +63,19 @@ TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " # meeting to discuss the path forward (separate versus superset SDKs), this # should be reviewed after that. TOOLCHAIN_TARGET_TASK += "mosquitto-dev" + +# Add nlohmann-json to support building the speech services. +# Required until either the agl-speech-framework feature is added as a +# dependency of agl-demo, or the speech services are migrated into the +# core profile. +TOOLCHAIN_TARGET_TASK += "nlohmann-json-dev" + +# Add libstdc++-staticdev to support building agl-service-voice-high or +# other users of the C++17 filesystem standard library feature. +# Can be removed upon upgrade to gcc 9.x, as it will no longer be necessary. +TOOLCHAIN_TARGET_TASK += "libstdc++-staticdev" + +# Add gcc-sanitizers to support building applications using the SDK with +# AddressSanitizer support to detect use-after-frees along with other +# memory issue. +TOOLCHAIN_TARGET_TASK += "gcc-sanitizers" diff --git a/meta-agl-demo/recipes-platform/images/agl-demo-platform-html5.bb b/meta-agl-demo/recipes-platform/images/agl-demo-platform-html5.bb new file mode 100644 index 00000000..2d3490fd --- /dev/null +++ b/meta-agl-demo/recipes-platform/images/agl-demo-platform-html5.bb @@ -0,0 +1,14 @@ +SUMMARY = "DEMO platform of AGL HTML5 profile" +DESCRIPTION = "Contains the web runtime and sample web apps" + +require agl-demo-platform.inc + +LICENSE = "MIT" + +IMAGE_FEATURES_append = " \ + " + +# add packages for demo platform (include demo apps) here +IMAGE_INSTALL_append = " \ + packagegroup-agl-demo-platform-html5 \ + " diff --git a/meta-agl-demo/recipes-platform/images/agl-image-ivi-crosssdk.bb b/meta-agl-demo/recipes-platform/images/agl-image-ivi-crosssdk.bb new file mode 100644 index 00000000..93537feb --- /dev/null +++ b/meta-agl-demo/recipes-platform/images/agl-image-ivi-crosssdk.bb @@ -0,0 +1,2 @@ +# just for backward compatibility +require recipes-platform/images/agl-image-minimal-crosssdk.bb diff --git a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb new file mode 100644 index 00000000..6ec717bd --- /dev/null +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb @@ -0,0 +1,32 @@ +SUMMARY = "The software for DEMO platform of AGL HTML5 profile" +DESCRIPTION = "Packages required to demo the HTML5 profile and sample web apps" + +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-demo-platform-html5 \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + packagegroup-agl-image-ivi \ + packagegroup-agl-profile-graphical-html5 \ + packagegroup-agl-demo \ + " + +AGL_APPS = " \ + html5-homescreen \ + html5-launcher \ + html5-hvac \ + html5-settings \ + html5-mixer \ + html5-mediaplayer \ + html5-dashboard \ + " + +RDEPENDS_${PN}_append = " \ + ${AGL_APPS} \ + " diff --git a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index 128d4d7e..acd77882 100644 --- a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -20,22 +20,6 @@ RDEPENDS_${PN} += "\ packagegroup-agl-demo \ " -MOST_DRIVERS = " \ - most \ - " -MOST_DRIVERS_append_m3ulcb = " sllin" - -# HVAC dependencies depend on drivers above -MOST_HVAC = " " -MOST_HVAC_append = " \ - ${MOST_DRIVERS} \ - unicens-config \ - agl-service-unicens \ - " - -# @Chris: This needs to be checked! -MOST_HVAC_dra7xx-evm = "" -MOST_HVAC_dragonboard-410c = "" AGL_APPS = " \ dashboard \ @@ -46,47 +30,60 @@ AGL_APPS = " \ poiapp \ radio \ settings \ + messaging \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'taskmanager' , '', d)} \ - high-level-viwi-service \ - agl-service-signal-composer \ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \ low-can-demo \ virtual/mixer \ - " - -AGL_APIS = " \ - libnaviapi-agl \ + ${@bb.utils.contains('IMAGE_FEATURES', 'agl-voiceagent-alexa', 'alexa-viewer' , '', d)} \ " QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras", "",d)}" +QTAGLEXTRAS_append = " libqtappfw" + +# 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" + +# packages from hmi-framework aka homescreen-2017 +HOMESCREEN = "packagegroup-hmi-framework" # Cluster demo support. -# ATM mapviewer is required for navigation map viewing when doing cluster -# demos with the older navigation application. -MAPVIEWER = "${@bb.utils.contains("PREFERRED_PROVIDER_virtual/navigation", "navigation", "mapviewer", "",d)}" -CLUSTER_SUPPORT = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-support", "${MAPVIEWER} cluster-demo-network-config", "",d)}" +# ATM no cluster map viewer is supported with the older navigation application. +MAPVIEWER = "${@bb.utils.contains("PREFERRED_RPROVIDER_virtual/navigation", "ondemandnavi", "tbtnavi", "",d)}" +CLUSTER_SUPPORT_PACKAGES = " \ + ${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)}" + +# 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 " # 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_PROVIDER_virtual/navigation", "navigation", " navigation-maps-${DEMO_MAPS_LOCALE}", "",d)}" -DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", " ${DEMO_PRELOAD_MAPS} poiapp-api-key", "",d)}" +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)}" -# 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 \ - ${MOST_HVAC} \ ${AGL_APPS} \ - ${AGL_APIS} \ ${QTAGLEXTRAS} \ ${CLUSTER_SUPPORT} \ ${DEMO_PRELOAD} \ - ${DEMO_PLATFORM_CONF} \ + ${HOMESCREEN} \ " diff --git a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo.bb index 59757819..164684f2 100644 --- a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo.bb @@ -11,19 +11,45 @@ PACKAGES = "\ ALLOW_EMPTY_${PN} = "1" +# MOST out-of-tree kernel drivers +################################# +MOST_DRIVERS ??= " \ + most \ + " +# These boards use different kernels - needs to be checked +MOST_DRIVERS_dra7xx-evm ?= "" +MOST_DRIVERS_dragonboard-410c ?= "" + + +# HVAC dependencies +################### +LIN_DRIVERS ??= " sllin sllin-virtual" +# These boards use different kernels - needs to be checked +LIN_DRIVERS_dra7xx-evm ?= "sllin-virtual" +LIN_DRIVERS_dragonboard-410c ?= "sllin-virtual" + +# UNICENS service +UNICENS ?= " \ + unicens-config \ + agl-service-unicens \ + agl-service-unicens-controller \ + " + +# Hook for demo platform configuration +# ATM, only used to disable btwilink module on [MH]3ULCB + 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_ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", "true", "", " btwilink-disable-conf", d)}" + SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \ 'packagegroup-agl-smartdevicelink', '', d)}" -# packages from hmi-framework aka homescreen-2017 -HOMESCREEN = "packagegroup-hmi-framework" - # removed: now all enablers are in meta-agl-devel/meta-audio-soundmanager-framework # old audio package # AUDIO-OLD = "audiomanager" RDEPENDS_${PN} += "\ - libqtappfw \ - ${HOMESCREEN} \ udisks \ ${SMARTDEVICELINK} \ " @@ -40,23 +66,19 @@ TTF_FONTS = " \ noto-emoji \ " -#EXTRA_APPS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'qtwebengine', '', d)}" -#EXTRA_APPS_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles" -#IMAGE_INSTALL_append = " qtwebengine-examples" - -# add support for websocket in Qt and QML -EXTRA_APPS_append = " qtwebsockets qtwebsockets-qmlplugins" -PREFERRED_PROVIDER_virtual/webruntime = "web-runtime" - RDEPENDS_${PN} += " \ linux-firmware-ath9k \ + linux-firmware-ralink \ can-utils \ iproute2 \ python-curses \ dhcp-client \ + ${UNICENS} \ + ${MOST_DRIVERS} \ + ${LIN_DRIVERS} \ + ${DEMO_PLATFORM_CONF} \ ${TTF_FONTS} \ - ${EXTRA_APPS} \ ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \ " diff --git a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb index 0edc600c..acaa405a 100644 --- a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb @@ -18,14 +18,9 @@ RDEPENDS_${PN} += "\ packagegroup-agl-ivi-connectivity \ packagegroup-agl-ivi-graphics \ packagegroup-agl-ivi-multimedia \ + packagegroup-agl-ivi-navigation \ + packagegroup-agl-ivi-services \ " -# packagegroup-agl-ivi-automotive \ -# packagegroup-agl-ivi-speech-services \ -# packagegroup-agl-ivi-navi-lbs \ -# packagegroup-agl-ivi-security \ -# packagegroup-agl-ivi-os-commonlibs \ -# packagegroup-agl-ivi-kernel \ -# RDEPENDS_${PN} += "\ agl-login-manager \ diff --git a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb index 2d45986d..17d0d4b6 100644 --- a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb @@ -11,5 +11,10 @@ PACKAGES = "\ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ + bluez5-obex \ + ${@bb.utils.contains("DISTRO_FEATURES", "3g", "libqmi", "", d)} \ + rtl-sdr \ + neard \ + neardal-tools \ ofono \ " diff --git a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb new file mode 100644 index 00000000..90daf923 --- /dev/null +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb @@ -0,0 +1,17 @@ +SUMMARY = "The software for application framework of AGL IVI profile" +DESCRIPTION = "A set of packages belong to AGL application framework which required by \ +Navigation and Location-Based Services Subsystem" + +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-ivi-navigation \ + " + +RDEPENDS_${PN} += "\ + gpsd \ + virtual/gpsd-conf \ + geoclue \ + " diff --git a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb new file mode 100644 index 00000000..40359ed3 --- /dev/null +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "The minimal set of packages for AGL IVI Connectivity Subsystem" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-ivi-services \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ +agl-service-bluetooth \ +agl-service-bluetooth-map \ +agl-service-bluetooth-pbap \ +agl-service-can-high-level-viwi \ +agl-service-can-low-level \ +agl-service-geoclue \ +agl-service-geofence \ +agl-service-gps \ +agl-service-identity-agent \ +agl-service-iiodevices \ +agl-service-mediascanner \ +agl-service-navigation \ +agl-service-nfc \ +agl-service-signal-composer \ +agl-service-steering-wheel \ +agl-service-unicens \ +agl-service-weather \ + " |