From 0f0930025966279ab4997f211175f826a686f8e2 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 22 Sep 2012 19:42:17 +0100 Subject: [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script Use ${bindir} to locate the binary instead. (From OE-Core rev: 8cf6f87bd753e1c84a018ddb92a97eed7bd79a28) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus-1.6.4/dbus-1.init | 2 +- meta/recipes-core/dbus/dbus.inc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/dbus/dbus-1.6.4/dbus-1.init b/meta/recipes-core/dbus/dbus-1.6.4/dbus-1.init index 17b58ed..64f2170 100644 --- a/meta/recipes-core/dbus/dbus-1.6.4/dbus-1.init +++ b/meta/recipes-core/dbus/dbus-1.6.4/dbus-1.init @@ -16,7 +16,7 @@ set -e -DAEMON=/usr/bin/dbus-daemon +DAEMON=@bindir@/dbus-daemon NAME=dbus DAEMONUSER=messagebus # must match /etc/dbus-1/system.conf PIDFILE=/var/run/messagebus.pid # must match /etc/dbus-1/system.conf diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 8f35f56..5c99e11 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -10,7 +10,7 @@ DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X DEPENDS_virtclass-native = "expat-native virtual/libintl-native" DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" -INC_PR = "r3" +INC_PR = "r4" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \ @@ -79,7 +79,8 @@ do_install() { autotools_do_install install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh + install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 install -d ${D}${sysconfdir}/default/volatiles echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \ -- 2.7.4