diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-10-01 11:04:36 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 14:13:57 +0100 |
| commit | 9f37ce18b7d79135a67474187b6119980e0130ae (patch) | |
| tree | 6a31fcbb7c6606593cbc7f21b006a0197d25744b /meta/recipes-connectivity/connman | |
| parent | 0f6f87c60a6ffeff6b3f53d25f4023749103e262 (diff) | |
| download | openembedded-core-9f37ce18b7d79135a67474187b6119980e0130ae.tar.gz | |
xuser-account: Take over xuser specific D-Bus policy
Move connmans xuser-related D-Bus policy to a separate file that
xuser-account installs: This way connman does not need to depend on
xuser-account. Add policies for bluez and ofono in the same file.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
3 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 1712af3016..ab7f86d12a 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -107,7 +107,6 @@ RPROVIDES_${PN} = "\ RDEPENDS_${PN} = "\ dbus \ - xuser-account \ " PACKAGES_DYNAMIC += "^${PN}-plugin-.*" diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch deleted file mode 100644 index 15a191da55..0000000000 --- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch +++ /dev/null @@ -1,43 +0,0 @@ -Because Poky doesn't support at_console we need to -special-case the session user. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - ---- - src/connman-dbus.conf | 3 +++ - vpn/vpn-dbus.conf | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf -index 98a773e..466809c 100644 ---- a/src/connman-dbus.conf -+++ b/src/connman-dbus.conf -@@ -8,6 +8,9 @@ - <allow send_interface="net.connman.Counter"/> - <allow send_interface="net.connman.Notification"/> - </policy> -+ <policy user="xuser"> -+ <allow send_destination="net.connman"/> -+ </policy> - <policy at_console="true"> - <allow send_destination="net.connman"/> - </policy> -diff --git a/vpn/vpn-dbus.conf b/vpn/vpn-dbus.conf -index 0f0c8da..9ad05b9 100644 ---- a/vpn/vpn-dbus.conf -+++ b/vpn/vpn-dbus.conf -@@ -6,6 +6,9 @@ - <allow send_destination="net.connman.vpn"/> - <allow send_interface="net.connman.vpn.Agent"/> - </policy> -+ <policy user="xuser"> -+ <allow send_destination="net.connman.vpn"/> -+ </policy> - <policy at_console="true"> - <allow send_destination="net.connman.vpn"/> - </policy> --- -2.1.4 - diff --git a/meta/recipes-connectivity/connman/connman_1.30.bb b/meta/recipes-connectivity/connman/connman_1.30.bb index 9b512c565f..7d65ac931c 100644 --- a/meta/recipes-connectivity/connman/connman_1.30.bb +++ b/meta/recipes-connectivity/connman/connman_1.30.bb @@ -2,7 +2,6 @@ require connman.inc SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ - file://add_xuser_dbus_permission.patch \ file://0001-Detect-backtrace-API-availability-before-using-it.patch \ file://0002-resolve-musl-does-not-implement-res_ninit.patch \ file://0003-Fix-header-inclusions-for-musl.patch \ |