diff options
| -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> |