diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-10-01 11:04:35 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 14:13:56 +0100 |
| commit | 0f6f87c60a6ffeff6b3f53d25f4023749103e262 (patch) | |
| tree | 2dc12211ce82edd52535d98c06e658de934340ec /meta/recipes-connectivity | |
| parent | 2055517d91e0c55ed108d3a6f52abd1d2c6824b2 (diff) | |
| download | openembedded-core-contrib-0f6f87c60a6ffeff6b3f53d25f4023749103e262.tar.gz | |
bluez5: Use upstream D-Bus policy
The Bluez D-Bus policy is much too open and affects not just bluez but
all system services: Use upstream policy configuration instead.
This change has a chance of affecting other D-Bus services: the bug
that is fixed here may have hidden problems in other policies.
[YOCTO #8414]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf | 17 |
2 files changed, 2 insertions, 20 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 039c44354e..df42c88b9d 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -18,7 +18,6 @@ PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ - file://bluetooth.conf \ " S = "${WORKDIR}/bluez-${PV}" @@ -53,8 +52,8 @@ do_install_append() { if [ -f ${S}/profiles/input/input.conf ]; then install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ fi - # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT - install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ + + install -m 0644 ${S}/src/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ # Install desired tools that upstream leaves in build area for f in ${NOINST_TOOLS} ; do diff --git a/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf b/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf deleted file mode 100644 index 26845bb73c..0000000000 --- a/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf +++ /dev/null @@ -1,17 +0,0 @@ -<!-- This configuration file specifies the required security policies - for Bluetooth core daemon to work. --> - -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- ../system.conf have denied everything, so we just punch some holes --> - - <policy context="default"> - <allow own="org.bluez"/> - <allow send_destination="org.bluez"/> - <allow send_interface="org.bluez.Agent1"/> - <allow send_type="method_call"/> - </policy> - -</busconfig> |