diff options
Diffstat (limited to 'meta-agl-demo/recipes-platform')
10 files changed, 94 insertions, 110 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 a814b694..641befa0 100755..100644 --- a/meta-agl-demo/recipes-platform/images/agl-demo-platform-crosssdk.bb +++ b/meta-agl-demo/recipes-platform/images/agl-demo-platform-crosssdk.bb @@ -8,8 +8,7 @@ require agl-demo-platform.bb LICENSE = "MIT" -IMAGE_FEATURES_append = " dev-pkgs" -IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" +require recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc inherit populate_sdk populate_sdk_qt5 @@ -18,45 +17,6 @@ inherit populate_sdk populate_sdk_qt5 # can failed (randomly). addtask do_populate_sdk after do_rootfs -# native tools to support Chromium build inside SDK (SPEC-942) -TOOLCHAIN_HOST_TASK += " \ - nativesdk-gn \ - nativesdk-ninja \ - nativesdk-gperf \ - nativesdk-zlib \ - nativesdk-xz \ - nativesdk-nspr-dev \ - nativesdk-nss-dev \ - nativesdk-lua \ - " - -# required dependencies for Chromium build inside SDK (SPEC-942) -TOOLCHAIN_TARGET_TASK += " \ - pciutils-dev \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-dev' , '', d)} \ - cairo-dev \ - nss-dev \ - cups-dev \ - gconf-dev \ - libexif-dev \ - pango-dev \ - libdrm-dev \ - lua-dev \ - lua-staticdev \ - libafb-helpers-staticdev \ - libafb-helpers-qt-staticdev \ - libappcontroller-staticdev \ - ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'ffmpeg-dev', '', d)} \ - " - -# Add wayland-scanner to SDK (SPEC-945) -# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup -# wayland-scanner is in nativesdk-wayland-dev ! -# option: add also nativesdk-qtwayland-tools -TOOLCHAIN_HOST_TASK_append = " nativesdk-wayland nativesdk-wayland-dev" - -TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " - # Add mosquitto to support building the telematics demo application. # This is currently required for CI, as it uses agl-demo-platform-crosssdk # to build everything. An agenda item has been tabled for the May 2019 F2F @@ -79,3 +39,17 @@ TOOLCHAIN_TARGET_TASK += "libstdc++-staticdev" # AddressSanitizer support to detect use-after-frees along with other # memory issue. TOOLCHAIN_TARGET_TASK += "gcc-sanitizers" + +# Add azure-iot-sdk-c to support building agl-service-cloudproxy +# and other users of Azure sdk. +TOOLCHAIN_TARGET_TASK += "azure-iot-sdk-c umock-c" + +# Add mbedTLS to support building aws-iot-device-sdk-embedded-c +TOOLCHAIN_TARGET_TASK += "mbedtls" + +# Add aws-iot-device-embedded-c sdk to support building agl-service-cloudproxy +# and other users of AWS sdk. +# These packages are required to add static library and headers: +TOOLCHAIN_TARGET_TASK += "aws-iot-device-sdk-embedded-c-staticdev" +TOOLCHAIN_TARGET_TASK += "aws-iot-device-sdk-embedded-c-dev" + diff --git a/meta-agl-demo/recipes-platform/images/agl-demo-platform.bb b/meta-agl-demo/recipes-platform/images/agl-demo-platform.bb index 297cb706..c5a1edb2 100644 --- a/meta-agl-demo/recipes-platform/images/agl-demo-platform.bb +++ b/meta-agl-demo/recipes-platform/images/agl-demo-platform.bb @@ -5,11 +5,16 @@ require agl-demo-platform.inc LICENSE = "MIT" -IMAGE_FEATURES_append = " \ - " +# The demo will not work on the pi3 due to the gfx memory +# and the applications requiring FHD (SPEC-390) +COMPATIBLE_MACHINE_raspberrypi3 = "(^$)" + +# Always include the test widgets +IMAGE_FEATURES_append = " agl-test-wgt" # add packages for demo platform (include demo apps) here IMAGE_INSTALL_append = " \ packagegroup-agl-demo-platform \ + distro-build-manifest \ " diff --git a/meta-agl-demo/recipes-platform/images/agl-demo-platform.inc b/meta-agl-demo/recipes-platform/images/agl-demo-platform.inc index 203fcc07..f363e304 100644 --- a/meta-agl-demo/recipes-platform/images/agl-demo-platform.inc +++ b/meta-agl-demo/recipes-platform/images/agl-demo-platform.inc @@ -1,3 +1,2 @@ # Base image -require recipes-platform/images/agl-image-ivi.inc - +require agl-image-ivi.inc diff --git a/meta-agl-demo/recipes-platform/images/agl-image-ivi.bb b/meta-agl-demo/recipes-platform/images/agl-image-ivi.bb index dd4f89b1..1e587006 100644 --- a/meta-agl-demo/recipes-platform/images/agl-image-ivi.bb +++ b/meta-agl-demo/recipes-platform/images/agl-image-ivi.bb @@ -11,7 +11,3 @@ IMAGE_INSTALL_append = "\ " DISTRO_FEATURES_append = " agl-core-image-profile" - -IMAGE_INSTALL += "\ - agl-desktop-config \ - " 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 index 6ec717bd..176bfefd 100644 --- 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 @@ -25,6 +25,7 @@ AGL_APPS = " \ html5-mixer \ html5-mediaplayer \ html5-dashboard \ + html5-background \ " RDEPENDS_${PN}_append = " \ 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 acd77882..314382ec 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 @@ -5,8 +5,10 @@ LICENSE = "MIT" inherit packagegroup +PROVIDES = "${PACKAGES}" PACKAGES = "\ packagegroup-agl-demo-platform \ + packagegroup-agl-demo-platform-devel \ " ALLOW_EMPTY_${PN} = "1" @@ -17,10 +19,10 @@ RDEPENDS_${PN} += "\ RDEPENDS_${PN} += "\ packagegroup-agl-profile-graphical-qt5 \ + packagegroup-hmi-framework \ packagegroup-agl-demo \ " - AGL_APPS = " \ dashboard \ hvac \ @@ -32,25 +34,15 @@ AGL_APPS = " \ settings \ messaging \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'taskmanager' , '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \ - low-can-demo \ virtual/mixer \ - ${@bb.utils.contains('IMAGE_FEATURES', 'agl-voiceagent-alexa', 'alexa-viewer' , '', d)} \ + virtual/qtwayland-config \ " -QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras", "",d)}" -QTAGLEXTRAS_append = " libqtappfw" +QTAGLEXTRAS = " 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" +#PREFERRED_PROVIDER_virtual/webruntime = "web-runtime" # Cluster demo support. # ATM no cluster map viewer is supported with the older navigation application. @@ -63,11 +55,12 @@ CLUSTER_SUPPORT_PACKAGES = " \ " 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. -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. @@ -75,15 +68,34 @@ 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_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 = " \ qtquickcontrols2-agl \ qtquickcontrols2-agl-style \ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \ ${AGL_APPS} \ ${QTAGLEXTRAS} \ ${CLUSTER_SUPPORT} \ ${DEMO_PRELOAD} \ - ${HOMESCREEN} \ + " + +# NOTE: Currently no coverage versions for the application widgets, +# they should be added here when available. +# Also, the navigation and mixer debug widgets are currently +# specified explicitly, as there's no simple way to derive their +# names from the virtual/ RPROVIDES at present. +RDEPENDS_${PN}-devel = " \ + packagegroup-hmi-framework-devel \ + dashboard-dbg \ + hvac-dbg \ + mediaplayer-dbg \ + mixer-dbg \ + phone-dbg \ + ondemandnavi-dbg \ + poiapp-dbg \ + radio-dbg \ + settings-dbg \ + messaging-dbg \ + taskmanager-dbg \ " 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 164684f2..7fb098ad 100644 --- a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-demo.bb @@ -17,16 +17,16 @@ MOST_DRIVERS ??= " \ most \ " # These boards use different kernels - needs to be checked -MOST_DRIVERS_dra7xx-evm ?= "" MOST_DRIVERS_dragonboard-410c ?= "" +MOST_DRIVERS_cyclone5 ?= "" # HVAC dependencies ################### -LIN_DRIVERS ??= " sllin sllin-virtual" +LIN_DRIVERS ??= " sllin" # These boards use different kernels - needs to be checked -LIN_DRIVERS_dra7xx-evm ?= "sllin-virtual" -LIN_DRIVERS_dragonboard-410c ?= "sllin-virtual" +LIN_DRIVERS_dra7xx-evm ?= "" +LIN_DRIVERS_dragonboard-410c ?= "" # UNICENS service UNICENS ?= " \ @@ -42,16 +42,8 @@ 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)}" - -# removed: now all enablers are in meta-agl-devel/meta-audio-soundmanager-framework -# old audio package -# AUDIO-OLD = "audiomanager" - RDEPENDS_${PN} += "\ - udisks \ - ${SMARTDEVICELINK} \ + udisks2 \ " # fonts @@ -60,10 +52,10 @@ TTF_FONTS = " \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ ttf-dejavu-serif \ + ttf-noto-emoji-color \ source-han-sans-cn-fonts \ source-han-sans-jp-fonts \ source-han-sans-tw-fonts \ - noto-emoji \ " @@ -72,7 +64,6 @@ RDEPENDS_${PN} += " \ linux-firmware-ralink \ can-utils \ iproute2 \ - python-curses \ dhcp-client \ ${UNICENS} \ ${MOST_DRIVERS} \ @@ -81,5 +72,3 @@ RDEPENDS_${PN} += " \ ${TTF_FONTS} \ ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \ " - - diff --git a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb index 8831e10a..d7650564 100644 --- a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb @@ -11,5 +11,4 @@ PACKAGES = "\ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ - opencv \ " 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 index 40359ed3..1c375705 100644 --- a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "The minimal set of packages for AGL IVI Connectivity Subsystem" +DESCRIPTION = "The minimal set of services to support AGL IVI demo" LICENSE = "MIT" inherit packagegroup @@ -7,24 +7,24 @@ 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 \ + agl-service-bluetooth \ + agl-service-bluetooth-map \ + agl-service-bluetooth-pbap \ + agl-service-can-low-level \ + agl-service-geoclue \ + agl-service-geofence \ + agl-service-gps \ + agl-service-hvac \ + agl-service-identity-agent \ + agl-service-iiodevices \ + agl-service-mediascanner \ + agl-service-navigation \ + agl-service-nfc \ + agl-service-signal-composer \ + agl-service-telephony \ + agl-service-unicens \ + agl-service-unicens-controller \ + agl-service-weather \ + ${@bb.utils.contains('AGL_CLOUDPROXY_WANTED','1', 'agl-service-cloudproxy', '', d)} \ " diff --git a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-hmi-framework.bb b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-hmi-framework.bb index cf704e63..6e074930 100644 --- a/meta-agl-demo/recipes-platform/packagegroups/packagegroup-hmi-framework.bb +++ b/meta-agl-demo/recipes-platform/packagegroups/packagegroup-hmi-framework.bb @@ -9,15 +9,24 @@ PR = "2" inherit packagegroup -RDEPENDS_${PN} += " \ - agl-service-windowmanager \ +PROVIDES = "${PACKAGES}" +PACKAGES = "\ + packagegroup-hmi-framework \ + packagegroup-hmi-framework-devel \ + " + +RDEPENDS_${PN} = " \ agl-service-homescreen \ homescreen \ - libwindowmanager \ - qlibwindowmanager \ libhomescreen \ qlibhomescreen \ - runxdg \ hmi-debug \ launcher \ " +# NOTE: Currently no coverage versions of these widgets, they should +# be added here when available. +RDEPENDS_${PN}-devel = " \ + agl-service-homescreen-dbg \ + homescreen-dbg \ + launcher-dbg \ +" |