summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorChristian Ege <k4230r6@gmail.com>2016-05-11 21:18:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-20 10:20:55 +0100
commit55c383d1b76088ff6e61456550f2f6c9772c1d61 (patch)
treebe47af2dbe387c13a036ccf2f48fb6e81b60efa9 /meta/recipes-connectivity
parentb0207e742542cc44086d612df0a216cc45875538 (diff)
downloadopenembedded-core-contrib-55c383d1b76088ff6e61456550f2f6c9772c1d61.tar.gz
openembedded-core-contrib-55c383d1b76088ff6e61456550f2f6c9772c1d61.tar.bz2
openembedded-core-contrib-55c383d1b76088ff6e61456550f2f6c9772c1d61.zip
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: 63cde9b8101ed39376529f3205d32729341d5802) 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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc4
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/init2
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 9063629b9b..b3cd8ed5ca 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -61,6 +61,10 @@ do_install_append() {
install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
fi
+ if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
+ sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
+ fi
+
# Install desired tools that upstream leaves in build area
for f in ${NOINST_TOOLS} ; do
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 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
DESC=bluetooth
-DAEMON=/usr/lib/bluez5/bluetooth/bluetoothd
+DAEMON=@LIBEXECDIR@/bluetooth/bluetoothd
# If you want to be ignore error of "org.freedesktop.hostname1",
# please enable NOPLUGIN_OPTION.