diff options
author | Scott Murray <scott.murray@konsulko.com> | 2018-12-04 17:31:48 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2018-12-04 17:36:45 -0500 |
commit | 0e67702a452e99af3f42f483560d66e131fc74be (patch) | |
tree | b6c79a6d09fa64ac5bfe300fea8ebd76e931c73b | |
parent | af3ecc175fdb3cfbb7501ec5f1aad7718c08472a (diff) |
Add agl-demo-preload feature
Add a feature to preload the maps for the navigation app and the API key
for the POI app. The intent is to allow building an image that works
"out of the box" without manually installing things. The selection of
UK or Japan maps can be controlled by setting the variable
DEMO_MAPS_LOCALE to either "uk" (default) or "jp" in local.conf or
site.conf. The POI API key should be set in one of those locations with
the variable POIAPP_API_KEY (default value is an empty string).
Change-Id: I25537935ddac740090f2121d0a83305c746185b0
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
6 files changed, 65 insertions, 0 deletions
diff --git a/recipes-demo-hmi/navigation/navigation-maps-jp_1.0.bb b/recipes-demo-hmi/navigation/navigation-maps-jp_1.0.bb new file mode 100755 index 000000000..27979b3db --- /dev/null +++ b/recipes-demo-hmi/navigation/navigation-maps-jp_1.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "AGL Reference Navigation application Japan maps" +DESCRIPTION = "Preload the Japanese maps for the AGL Navigation application." +HOMEPAGE = "http://agl.wismobi.com/" +SECTION = "apps" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM="file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" + +SRC_URI = "http://agl.wismobi.com/data/japan_TR9/navi_data.tar.gz" +SRC_URI[md5sum] = "4fd44b0633d44d41c07227d086cd299c" +SRC_URI[sha256sum] = "ce39a36741baccd6b40277acb8c81ebc181997c75483dffb46ccd22f7877295a" + +require navigation-maps.inc + +RCONFLICTS_${PN} = "navigation-maps-uk" diff --git a/recipes-demo-hmi/navigation/navigation-maps-uk_1.0.bb b/recipes-demo-hmi/navigation/navigation-maps-uk_1.0.bb new file mode 100755 index 000000000..1718c36b0 --- /dev/null +++ b/recipes-demo-hmi/navigation/navigation-maps-uk_1.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "AGL Reference Navigation application UK maps" +DESCRIPTION = "Preload the UK maps for the AGL Navigation application." +HOMEPAGE = "http://agl.wismobi.com/" +SECTION = "apps" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM="file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" + +SRC_URI = "http://agl.wismobi.com/data/UnitedKingdom_TR9/navi_data_UK.tar.gz" +SRC_URI[md5sum] = "f711c6d2c88553a1de4db9f7e12f6e8e" +SRC_URI[sha256sum] = "515bdc81ac0615d541e0d18c186ad5cd24de2d47b60e13079a918f6dec802fd7" + +require navigation-maps.inc + +RCONFLICTS_${PN} = "navigation-maps-jp" diff --git a/recipes-demo-hmi/navigation/navigation-maps.inc b/recipes-demo-hmi/navigation/navigation-maps.inc new file mode 100755 index 000000000..49b7ab496 --- /dev/null +++ b/recipes-demo-hmi/navigation/navigation-maps.inc @@ -0,0 +1,14 @@ +DEPENDS = "tar-native" + +SRC_URI_append = ";downloadfilename=${BP}.tar.gz;unpack=0" + +do_compile[noexec] = "1" + +do_install () { + install -d ${D}${localstatedir}/mapdata + tar -C ${D}${localstatedir}/mapdata --no-same-owner -xf ${WORKDIR}/${BP}.tar.gz +} + +FILES_${PN} += "${localstatedir}/mapdata/*" + +RDEPENDS_${PN} += "navigation" diff --git a/recipes-demo-hmi/navigation/poiapp-api-key_1.0.bb b/recipes-demo-hmi/navigation/poiapp-api-key_1.0.bb new file mode 100755 index 000000000..ad6546fea --- /dev/null +++ b/recipes-demo-hmi/navigation/poiapp-api-key_1.0.bb @@ -0,0 +1,17 @@ +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" + +do_fetch[noexec] = "1" +do_unpack[noexec] = "1" +do_compile[noexec] = "1" + +POIAPP_API_KEY ?= "" + +do_install () { + install -d ${D}${sysconfdir} + echo "${POIAPP_API_KEY}" > ${D}${sysconfdir}/poikey +} diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index 9deaea2a1..40e4d3c20 100755 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -61,6 +61,10 @@ QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qt # mapviewer and mapviewer-demo are required for AGL cluster demo MAPVIEWER = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-support", " mapviewer mapviewer-demo", "",d)}" +# Preload navigation maps and poi API key for demo if requested +DEMO_MAPS_LOCALE ?= "uk" +DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", " navigation-maps-${DEMO_MAPS_LOCALE} poiapp-api-key", "",d)}" + RDEPENDS_${PN}_append = " \ qtquickcontrols2-agl \ qtquickcontrols2-agl-style \ @@ -70,6 +74,7 @@ RDEPENDS_${PN}_append = " \ ${AGL_APIS} \ ${QTAGLEXTRAS} \ ${MAPVIEWER} \ + ${DEMO_PRELOAD} \ " diff --git a/templates/feature/agl-demo-preload/50_local.conf.inc b/templates/feature/agl-demo-preload/50_local.conf.inc new file mode 100644 index 000000000..c7524e5ae --- /dev/null +++ b/templates/feature/agl-demo-preload/50_local.conf.inc @@ -0,0 +1 @@ +DISTRO_FEATURES_append = " agl-demo-preload" |