From 63cde9b8101ed39376529f3205d32729341d5802 Mon Sep 17 00:00:00 2001 From: Christian Ege Date: Wed, 11 May 2016 21:18:48 +0200 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++++ meta/recipes-connectivity/bluez5/bluez5/init | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity') 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. -- cgit 1.2.3-korg