[oe-commits] [openembedded-core] 09/16: bluez5: fixed path to bluetoothd in sysvinit script

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 63cde9b8101ed39376529f3205d32729341d5802
Author: Christian Ege <k4230r6 at gmail.com>
AuthorDate: Wed May 11 21:18:48 2016 +0200

    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 at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-connectivity/bluez5/bluez5.inc  | 4 ++++
 meta/recipes-connectivity/bluez5/bluez5/init | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 9063629..b3cd8ed 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 1606a5c..489e9b9 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.

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.