From 41591d4f8c586aa801220fac0924556f406c58bd Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 8 Dec 2020 11:15:02 +0100 Subject: SPEC-3723: restructure meta-agl-demo All demo related components should be in here now. We keep the packagegroups on purpose for now to stay backward-compatible. v2: layer does pass yocto-check-layer, dependencies adapted v3: remove the dynamic-layer setup, use all-in-one approach v4: Fixed comments from Paul Barker. Tnx! v5: Removed wayland/weston/agl-compositor additions, except for demo specific weston-init bbappend Follow-up changes required later: - massaging packagegroups - scrub of recipes Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller Signed-off-by: Scott Murray Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8 --- recipes-demo/navigation/navigation-demo_git.bb | 32 +++++++++++++++++++ .../navigation/ondemandnavi-config/naviconfig.ini | 9 ++++++ recipes-demo/navigation/ondemandnavi-config_1.0.bb | 21 +++++++++++++ recipes-demo/navigation/ondemandnavi_git.bb | 33 ++++++++++++++++++++ recipes-demo/navigation/poiapp-api-key_1.0.bb | 21 +++++++++++++ .../poiapp/0001-add-display-permission.patch | 21 +++++++++++++ recipes-demo/navigation/poiapp_git.bb | 21 +++++++++++++ recipes-demo/navigation/tbtnavi_git.bb | 36 ++++++++++++++++++++++ 8 files changed, 194 insertions(+) create mode 100644 recipes-demo/navigation/navigation-demo_git.bb create mode 100644 recipes-demo/navigation/ondemandnavi-config/naviconfig.ini create mode 100644 recipes-demo/navigation/ondemandnavi-config_1.0.bb create mode 100644 recipes-demo/navigation/ondemandnavi_git.bb create mode 100644 recipes-demo/navigation/poiapp-api-key_1.0.bb create mode 100644 recipes-demo/navigation/poiapp/0001-add-display-permission.patch create mode 100644 recipes-demo/navigation/poiapp_git.bb create mode 100644 recipes-demo/navigation/tbtnavi_git.bb (limited to 'recipes-demo/navigation') diff --git a/recipes-demo/navigation/navigation-demo_git.bb b/recipes-demo/navigation/navigation-demo_git.bb new file mode 100644 index 00000000..7f3fcdf1 --- /dev/null +++ b/recipes-demo/navigation/navigation-demo_git.bb @@ -0,0 +1,32 @@ +SUMMARY = "Navigation demo based on Qt examples" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/navigation" +SECTION = "apps" + +LICENSE = "BSD-3-Clause & CC0v1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b6bbd37d85cd2b68082aa7be27853da1 \ + file://LICENSE.for_car_png;md5=65d3616852dbf7b1a6d4b53b00626032 \ + " + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/navigation;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git" + +RPROVIDES_${PN} = "virtual/navigation" + +DEPENDS += "qtquickcontrols2 \ + libhomescreen \ + qtvirtualkeyboard \ + qtlocation \ + " + +RDEPENDS_${PN} = " \ + agl-service-gps \ + agl-service-geoclue \ + agl-service-geofence \ + qtlocation \ + qtvirtualkeyboard \ + " + +inherit qmake5 aglwgt diff --git a/recipes-demo/navigation/ondemandnavi-config/naviconfig.ini b/recipes-demo/navigation/ondemandnavi-config/naviconfig.ini new file mode 100644 index 00000000..356c6ae6 --- /dev/null +++ b/recipes-demo/navigation/ondemandnavi-config/naviconfig.ini @@ -0,0 +1,9 @@ +{ + "mapAccessToken":"MAPBOX_ACCESS_TOKEN", + "speed":60, + "interval":100, + "latitude":36.1363, + "longitude":-115.151, + "mapStyleUrls":"mapbox://styles/v1/mapbox/streets-v11", + "enableOSM":true +} diff --git a/recipes-demo/navigation/ondemandnavi-config_1.0.bb b/recipes-demo/navigation/ondemandnavi-config_1.0.bb new file mode 100644 index 00000000..212971f2 --- /dev/null +++ b/recipes-demo/navigation/ondemandnavi-config_1.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "AGL Reference On Demand Navigation application config." +DESCRIPTION = "Config file for on-demand navigation app." +HOMEPAGE = "https://github.com/YoshitoMomiyama/aglqtnavigation.git" +SECTION = "apps" +LICENSE = "Proprietary" + +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" + +SRC_URI = "file://naviconfig.ini \ + " + +inherit allarch + +MAPBOX_ACCESS_TOKEN ?= "Please set mapbox access token" + +do_compile[noexec] = "1" + +do_install () { + install -D -m 644 ${WORKDIR}/naviconfig.ini ${D}${sysconfdir}/naviconfig.ini + sed -i -e 's/MAPBOX_ACCESS_TOKEN/${MAPBOX_ACCESS_TOKEN}/' ${D}${sysconfdir}/naviconfig.ini +} diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb new file mode 100644 index 00000000..c06dcae2 --- /dev/null +++ b/recipes-demo/navigation/ondemandnavi_git.bb @@ -0,0 +1,33 @@ +SUMMARY = "AGL Reference On Demand Navigation application." +DESCRIPTION = "Demo AGL navigation application based on QtLocation widget." +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/ondemandnavi" +SECTION = "apps" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +DEPENDS += "qtquickcontrols2 \ + qlibhomescreen \ + qtlocation \ + libqtappfw \ +" + +PV = "1.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/ondemandnavi;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" + +S = "${WORKDIR}/git" + +inherit qmake5 aglwgt pkgconfig + +RDEPENDS_${PN} += "qtlocation \ + flite \ + libqtappfw \ + openjtalk \ + gstreamer1.0 \ + ondemandnavi-config \ +" + +RPROVIDES_${PN} = "virtual/navigation" + diff --git a/recipes-demo/navigation/poiapp-api-key_1.0.bb b/recipes-demo/navigation/poiapp-api-key_1.0.bb new file mode 100644 index 00000000..d353d7dd --- /dev/null +++ b/recipes-demo/navigation/poiapp-api-key_1.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "AGL Reference POI application API key." +DESCRIPTION = "Preload the API key for the AGL POI application." +HOMEPAGE = "https://github.com/AGLExport/genivi-navi-yelp-client" +SECTION = "apps" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM="file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" + +inherit allarch + +do_fetch[noexec] = "1" +do_unpack[noexec] = "1" +do_compile[noexec] = "1" + +POIAPP_CLIENT_ID ?= "" +POIAPP_API_KEY ?= "" + +do_install () { + install -d ${D}${sysconfdir} + echo "${POIAPP_CLIENT_ID}" > ${D}${sysconfdir}/poikey + echo "${POIAPP_API_KEY}" >> ${D}${sysconfdir}/poikey +} diff --git a/recipes-demo/navigation/poiapp/0001-add-display-permission.patch b/recipes-demo/navigation/poiapp/0001-add-display-permission.patch new file mode 100644 index 00000000..25a8fc31 --- /dev/null +++ b/recipes-demo/navigation/poiapp/0001-add-display-permission.patch @@ -0,0 +1,21 @@ +Add display permission + +Add display permission required to work with the running as non-root +change for applications. + +Upstream-Status: pending + +Signed-off-by: Scott Murray + +diff --git a/config.xml.in b/config.xml.in +index b8cfccd..bec206d 100755 +--- a/config.xml.in ++++ b/config.xml.in +@@ -13,6 +13,7 @@ + + + ++ + + GPL + diff --git a/recipes-demo/navigation/poiapp_git.bb b/recipes-demo/navigation/poiapp_git.bb new file mode 100644 index 00000000..2942bf07 --- /dev/null +++ b/recipes-demo/navigation/poiapp_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "AGL Reference POI application." +DESCRIPTION = "This application provides the function of destination search to AGL. It uses the API provided by AGL Reference Navigation. This application uses yelp WebAPI." +HOMEPAGE = "https://github.com/AGLExport/genivi-navi-yelp-client" +SECTION = "apps" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4ee23c52855c222cba72583d301d2338" + +DEPENDS += "qtbase json-c \ + libhomescreen \ + libqtappfw \ + " + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/poi-yelp;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" + +S = "${WORKDIR}/git" + +inherit cmake_qt5 pkgconfig aglwgt + +RDEPENDS_${PN} = "qtbase libqtappfw" diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb new file mode 100644 index 00000000..d2e8e633 --- /dev/null +++ b/recipes-demo/navigation/tbtnavi_git.bb @@ -0,0 +1,36 @@ +SUMMARY = "AGL Reference Navigation Cluster Streaming application" +DESCRIPTION = "Demo AGL turn by turn cluster navigation application based on QtLocation widget." +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/admin/repos/apps/tbtnavi" +SECTION = "apps" + +LICENSE = "Apache-2.0 & ISC & BSD-3-Clause & BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \ + file://LICENSE.mapbox-cheap-ruler-cpp;md5=761263ee6bdc98e8697d9fbc897021ba \ + file://LICENSE.mapbox-geometry.hpp;md5=6e44f5d6aeec54f40fc84eebe3c6fc6c \ + file://LICENSE.mapbox-variant;md5=79558839a9db3e807e4ae6f8cd100c1c \ + file://include/mapbox/recursive_wrapper.hpp;beginline=4;endline=13;md5=cd3341aae76c0cf8345935abd20f0051 \ +" + +DEPENDS += "qtbase \ + qtquickcontrols2 \ + qlibhomescreen \ + qtlocation \ + libqtappfw \ + wayland-native \ + qtwayland-native \ +" + +PV = "1.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/tbtnavi;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" + +S = "${WORKDIR}/git" + +inherit qmake5 aglwgt pkgconfig + +RDEPENDS_${PN} += "qtlocation \ + ondemandnavi-config \ + agl-service-navigation \ + libqtappfw \ +" -- cgit 1.2.3-korg