From 8c8455f86f6ee8e9a40d163b260b60aea250b297 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 9 Sep 2019 19:54:08 -0400 Subject: Migrate poiapp and libnaviapi-agl to AGL Gerrit Update the poiapp and libnaviapi-agl recipes to point at AGL Gerrit for their source repositories. Additionally, the libnaviapi-agl recipe has been moved to recipes-demo/navigation since being beside its users seems to be a more logical location, and a few lines have been reordered in the poiapp recipe to better match the OpenEmbedded style guide. Bug-AGL: SPEC-2787 Change-Id: I41334b47b4970adb51fc943368dba7e07bbf113d Signed-off-by: Scott Murray --- recipes-demo-hmi/libnaviapi-agl/libnaviapi-agl_git.bb | 18 ------------------ recipes-demo-hmi/navigation/libnaviapi-agl_git.bb | 18 ++++++++++++++++++ recipes-demo-hmi/navigation/poiapp_git.bb | 19 +++++++------------ 3 files changed, 25 insertions(+), 30 deletions(-) delete mode 100755 recipes-demo-hmi/libnaviapi-agl/libnaviapi-agl_git.bb create mode 100644 recipes-demo-hmi/navigation/libnaviapi-agl_git.bb diff --git a/recipes-demo-hmi/libnaviapi-agl/libnaviapi-agl_git.bb b/recipes-demo-hmi/libnaviapi-agl/libnaviapi-agl_git.bb deleted file mode 100755 index e4dc8440..00000000 --- a/recipes-demo-hmi/libnaviapi-agl/libnaviapi-agl_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "AGL Navigation API Library" -DESCRIPTION = "AGL Navigation API ver 0.1.0 library for C++" -HOMEPAGE = "https://github.com/AGLExport/agl-service-navigation" -LICENSE = "Apache-2.0" -SECTION = "libs" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" - -DEPENDS = "af-binder json-c libdbus-c++ af-main-native" - -inherit cmake - -SRC_URI = "git://github.com/AGLExport/agl-service-navigation;protocol=git;branch=master" -SRCREV = "1f1ffc92fcc882aa5e885badbc91a3384f5d77b1" -S = "${WORKDIR}/git" - -# FIXME: Remove once CMake+ninja issues are resolved -OECMAKE_GENERATOR = "Unix Makefiles" diff --git a/recipes-demo-hmi/navigation/libnaviapi-agl_git.bb b/recipes-demo-hmi/navigation/libnaviapi-agl_git.bb new file mode 100644 index 00000000..87087e1a --- /dev/null +++ b/recipes-demo-hmi/navigation/libnaviapi-agl_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "AGL Navigation API Library" +DESCRIPTION = "AGL Navigation API ver 0.1.0 library for C++" +HOMEPAGE = "https://github.com/AGLExport/agl-service-navigation" +LICENSE = "Apache-2.0" +SECTION = "libs" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +DEPENDS = "af-binder json-c libdbus-c++ af-main-native" + +inherit cmake + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-navigation;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" +S = "${WORKDIR}/git" + +# FIXME: Remove once CMake+ninja issues are resolved +OECMAKE_GENERATOR = "Unix Makefiles" diff --git a/recipes-demo-hmi/navigation/poiapp_git.bb b/recipes-demo-hmi/navigation/poiapp_git.bb index 9c9292b0..87263e10 100644 --- a/recipes-demo-hmi/navigation/poiapp_git.bb +++ b/recipes-demo-hmi/navigation/poiapp_git.bb @@ -6,20 +6,15 @@ SECTION = "apps" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=947b2d60ca3872e172034438e9801200" -inherit cmake_qt5 pkgconfig -inherit aglwgt - -DEPENDS += " qtbase json-c libnaviapi-agl \ - af-binder qlibwindowmanager libhomescreen \ +DEPENDS += "qtbase json-c libnaviapi-agl \ + qlibwindowmanager libhomescreen \ " -RDEPENDS_${PN} = " qtbase \ - " - -SRCREV = "c2691cb265d9198542482a860f1df378e8c2708b" -SRC_URI = "git://github.com/AGLExport/genivi-navi-yelp-client.git;branch=agl \ - file://0001-add-display-permission.patch \ - " +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" -- cgit 1.2.3-korg