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

Signed-off-by: Christian Ege <k4230r6@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index a508229a34043a93caecfd90243b1ddbde1b7053..01c64e8c6f5570b4213bf1b1da59795a9b581b23 100644 (file)
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -60,6 +60,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 1606a5c6630e00d8cba115e7c70d4ff960754c65..489e9b9eba33bdc749e35fa01884444c7511ddc1 100644 (file)
--- 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.