diff options
author | Christian Ege <k4230r6@gmail.com> | 2016-05-11 21:18:48 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 18:18:12 +0100 |
commit | 4376fb851791a1fb514873ad239d516dd7159341 (patch) | |
tree | ddb8ecf5df464da1b1f5b3479be8d64604895868 | |
parent | 8f51f6153a09f8048fb4c4ce9cf4a19655240de4 (diff) | |
download | poky-4376fb851791a1fb514873ad239d516dd7159341.tar.gz |
bluez5: fixed path to bluetoothd in sysvinit script
Within the sysvinit script the path to bluetoothd is wrong. Because of this
the init scripts silently terminates without any message
(From OE-Core rev: 4bcd78028ae1000ea4cd86f4a729d4497618ae85)
Signed-off-by: Christian Ege <k4230r6@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/init | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index a508229a34..01c64e8c6f 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
@@ -60,6 +60,10 @@ do_install_append() { | |||
60 | install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ | 60 | install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ |
61 | fi | 61 | fi |
62 | 62 | ||
63 | if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then | ||
64 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth | ||
65 | fi | ||
66 | |||
63 | # Install desired tools that upstream leaves in build area | 67 | # Install desired tools that upstream leaves in build area |
64 | for f in ${NOINST_TOOLS} ; do | 68 | for f in ${NOINST_TOOLS} ; do |
65 | install -m 755 ${B}/$f ${D}/${bindir} | 69 | install -m 755 ${B}/$f ${D}/${bindir} |
diff --git a/meta/recipes-connectivity/bluez5/bluez5/init b/meta/recipes-connectivity/bluez5/bluez5/init index 1606a5c663..489e9b9eba 100644 --- a/meta/recipes-connectivity/bluez5/bluez5/init +++ b/meta/recipes-connectivity/bluez5/bluez5/init | |||
@@ -3,7 +3,7 @@ | |||
3 | PATH=/sbin:/bin:/usr/sbin:/usr/bin | 3 | PATH=/sbin:/bin:/usr/sbin:/usr/bin |
4 | DESC=bluetooth | 4 | DESC=bluetooth |
5 | 5 | ||
6 | DAEMON=/usr/lib/bluez5/bluetooth/bluetoothd | 6 | DAEMON=@LIBEXECDIR@/bluetooth/bluetoothd |
7 | 7 | ||
8 | # If you want to be ignore error of "org.freedesktop.hostname1", | 8 | # If you want to be ignore error of "org.freedesktop.hostname1", |
9 | # please enable NOPLUGIN_OPTION. | 9 | # please enable NOPLUGIN_OPTION. |