geoclue: update configuration

Update the geoclue configuration to install a geoclue.conf that
works with the geoclue binding, and remove the now unnecessary
D-Bus client configuration.  This also enables future geoclue
updates, as the current configuration does not work with the
newer 2.5x releases.

Bug-AGL: SPEC-3819

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I06a2a15b38cbb8dad485bc7f38d1aef47803b87c

3 files changed, 106 insertions, 13 deletions

diff --git a/recipes-navigation/geoclue/files/geoclue.conf.agl b/recipes-navigation/geoclue/files/geoclue.conf.agl
new file mode 100644
index 000000000..420eacd98
--- /dev/null
+++ b/recipes-navigation/geoclue/files/geoclue.conf.agl
@@ -0,0 +1,103 @@
+# Configuration file for Geoclue
+#
+# NOTE: All configurations settings below are mandatory and the defaults are
+#       what you see before you edit them. If you want to keep the default
+#       values around, copy and comment out the appropriate line(s) before
+#       changing them.
+
+# Agent configuration options
+[agent]
+
+# Whitelist of desktop IDs (without .desktop part) of all agents we recognise,
+# separated by a ';'.
+whitelist=
+
+# Network NMEA source configuration options
+[network-nmea]
+
+# Fetch location from NMEA sources on local network?
+enable=true
+
+# 3G source configuration options
+[3g]
+
+# Enable 3G source
+enable=true
+
+# CDMA source configuration options
+[cdma]
+
+# Enable CDMA source
+enable=true
+
+# Modem GPS source configuration options
+[modem-gps]
+
+# Enable Modem-GPS source
+enable=true
+
+# WiFi source configuration options
+[wifi]
+
+# Enable WiFi source
+enable=true
+
+# URL to the wifi geolocation service. The key can currenty be anything, just
+# needs to be present but that is likely going to change in future.
+url=https://location.services.mozilla.com/v1/geolocate?key=geoclue
+
+# To use the Google geolocation service instead of mozilla's, simply uncomment
+# this url while changing API_KEY to your Google API key and comment out or
+# remove the url above.
+#
+# WARNING: Please make sure that you are complying with the Google's ToS and
+#          policies if you uncomment this:
+#
+# https://developers.google.com/maps/documentation/geolocation/policies
+#
+#url=https://www.googleapis.com/geolocation/v1/geolocate?key=YOUR_KEY
+
+# Submit data to Mozilla Location Service
+# If set to true, geoclue will automatically submit network data to Mozilla
+# each time it gets a GPS lock.
+#
+submit-data=false
+
+# URL to submission API of Mozilla Location Service
+submission-url=https://location.services.mozilla.com/v1/submit?key=geoclue
+
+# A nickname to submit network data with. A nickname must be 2-32 characters long.
+submission-nick=geoclue
+
+# Application configuration options
+#
+# NOTE: Having an entry here for an application with allowed=true means that
+#       geoclue will not ask agent to authorize the application. This is to
+#       ensure that applications with built-in authorization mechanism (e.g web
+#       browsers) do not have to be bound to agents.
+#
+#       If your application is denied access to location information and your
+#       operating system doesn't provide any mechanism to change that, it is
+#       likely a bug in your operation system (or geoclue). The solution is to
+#       report the issue with all details, rather than adding your application
+#       to this list.
+#
+# Format:
+#
+# # Desktop ID of application without .desktop part
+# [random-app]
+#
+# # Allowed access to location information?
+# allowed=true|false
+#
+# # Is application a system component?
+# system=true|false
+#
+# # List of UIDs of all users for which this application is allowed location
+# # info access, separate by ';'. Keep it empty for allowing it for all users.
+# users=
+
+[geoclue-binding]
+allowed=true
+system=true
+users=
diff --git a/recipes-navigation/geoclue/files/org.freedesktop.GeoClue2.Client.conf b/recipes-navigation/geoclue/files/org.freedesktop.GeoClue2.Client.conf
deleted file mode 100644
index a7486d055..000000000
--- a/recipes-navigation/geoclue/files/org.freedesktop.GeoClue2.Client.conf
+++ /dev/null
@@ -1,8 +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 user="root">
-    <allow receive_type="signal" receive_interface="org.freedesktop.GeoClue2.Client" />
-  </policy>
-</busconfig>
diff --git a/recipes-navigation/geoclue/geoclue_agldemo.inc b/recipes-navigation/geoclue/geoclue_agldemo.inc
index 24936e5cc..1e317031e 100644
--- a/recipes-navigation/geoclue/geoclue_agldemo.inc
+++ b/recipes-navigation/geoclue/geoclue_agldemo.inc
@@ -1,11 +1,9 @@
-inherit gobject-introspection
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = " file://org.freedesktop.GeoClue2.Client.conf"
+
+SRC_URI += "file://geoclue.conf.agl"
 
 PACKAGECONFIG = "nmea lib"
 
 do_install_append() {
-    install -d ${D}/etc/dbus-1/system.d
-    install -m 0644 ${WORKDIR}/org.freedesktop.GeoClue2.Client.conf ${D}/etc/dbus-1/system.d/org.freedesktop.GeoClue2.Client.conf
+    install -D -m 0644 ${WORKDIR}/geoclue.conf.agl ${D}${sysconfdir}/geoclue/geoclue.conf
 }