From 75ae0c88da4a0e25936aa3e8ccee39ae6a5b0cb0 Mon Sep 17 00:00:00 2001 From: Jacobo Aragunde Pérez Date: Mon, 9 Dec 2019 10:25:42 +0100 Subject: agl-demo-platform: refactor packagegroups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move Qt-specific packages to packagegroup-agl-demo-platform, and non-specific to packagegroup-agl-demo. The goal is to be able to reuse packagegroup-agl-demo in an HTML5-only demo image. Bug-AGL: SPEC-2322 Change-Id: I9e3e34a1b224e10915b6e3d8dae90d50d8c6c806 Signed-off-by: Jacobo Aragunde Pérez --- .../packagegroup-agl-demo-platform.bb | 49 ++++++--------------- .../packagegroups/packagegroup-agl-demo.bb | 50 ++++++++++++++++------ 2 files changed, 49 insertions(+), 50 deletions(-) (limited to 'recipes-platform/packagegroups') diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index 9f7524ac0..6059dbaa5 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -20,30 +20,6 @@ RDEPENDS_${PN} += "\ packagegroup-agl-demo \ " -# 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" -# These boards use different kernels - needs to be checked -LIN_DRIVERS_dra7xx-evm ?= "" -LIN_DRIVERS_dragonboard-410c ?= "" - -# UNICENS service -UNICENS ?= " \ - unicens-config \ - agl-service-unicens \ - agl-service-unicens-controller \ - " - AGL_APPS = " \ dashboard \ @@ -64,6 +40,18 @@ AGL_APPS = " \ " 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 no cluster map viewer is supported with the older navigation application. @@ -76,23 +64,12 @@ DEMO_MAPS_LOCALE ?= "uk" DEMO_PRELOAD_MAPS = "${@bb.utils.contains("PREFERRED_RPROVIDER_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)}" -# 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 \ - ${UNICENS} \ - ${MOST_DRIVERS} \ - ${LIN_DRIVERS} \ ${AGL_APPS} \ ${QTAGLEXTRAS} \ ${CLUSTER_SUPPORT} \ ${DEMO_PRELOAD} \ - ${DEMO_PLATFORM_CONF} \ + ${HOMESCREEN} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb index 597578196..9ba99fafd 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/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" +# These boards use different kernels - needs to be checked +LIN_DRIVERS_dra7xx-evm ?= "" +LIN_DRIVERS_dragonboard-410c ?= "" + +# 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 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)}" + 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)} \ " -- cgit 1.2.3-korg