From a6e0f8ed016d6bfc06b88a27249adf33378d4d99 Mon Sep 17 00:00:00 2001
From: Matt Ranostay <matt.ranostay@konsulko.com>
Date: Tue, 12 Nov 2019 07:02:11 +0200
Subject: ondemandnavi: remove org.agl.naviapi.conf from recipe

agl-service-navigation uses the afb framework and application
doesn't need DBus access anymore.

Bug-AGL: SPEC-2880
Change-Id: Ie381eff74cc4f053a02fe4e56f9fadc3cf191235
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
(cherry picked from commit 94d43cc23ef59dcce4912323e19c31247126c101)
---
 .../navigation/ondemandnavi/org.agl.naviapi.conf          | 15 ---------------
 recipes-demo-hmi/navigation/ondemandnavi_git.bb           |  9 +--------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100755 recipes-demo-hmi/navigation/ondemandnavi/org.agl.naviapi.conf

(limited to 'recipes-demo-hmi/navigation')

diff --git a/recipes-demo-hmi/navigation/ondemandnavi/org.agl.naviapi.conf b/recipes-demo-hmi/navigation/ondemandnavi/org.agl.naviapi.conf
deleted file mode 100755
index 7f4d85f0d..000000000
--- a/recipes-demo-hmi/navigation/ondemandnavi/org.agl.naviapi.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
-"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-	<policy context="default">
-		<!-- Allow everyone to talk to main service. We'll later add an agent to
-		     only share the location if user allows it. -->
-		<allow send_interface="org.agl.naviapi"/>
-	</policy>
-
-	<policy user="root">
-		<!-- Allow root to own the name on the bus -->
-		<allow own="org.agl.naviapi"/>
-	</policy>
-</busconfig>
diff --git a/recipes-demo-hmi/navigation/ondemandnavi_git.bb b/recipes-demo-hmi/navigation/ondemandnavi_git.bb
index 82f0ce82c..a2c79b86a 100644
--- a/recipes-demo-hmi/navigation/ondemandnavi_git.bb
+++ b/recipes-demo-hmi/navigation/ondemandnavi_git.bb
@@ -17,20 +17,13 @@ DEPENDS += "qtbase \
 
 PV = "1.0+git${SRCPV}"
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/ondemandnavi;protocol=https;branch=${AGL_BRANCH} \
-           file://org.agl.naviapi.conf \
-"
+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
 
-do_install_append() {
-   install -d ${D}/etc/dbus-1/session.d/
-   install -m 0644 ${WORKDIR}/org.agl.naviapi.conf ${D}/etc/dbus-1/session.d/
-}
-
 RDEPENDS_${PN} += "qtlocation \
                    flite \
                    libqtappfw \
-- 
cgit 1.2.3-korg