diff options
| author | Phil Blundell <philb@gnu.org> | 2012-09-22 19:42:17 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-24 11:16:29 +0100 |
| commit | 8cf6f87bd753e1c84a018ddb92a97eed7bd79a28 (patch) | |
| tree | 6e13e1e56a966d1037aa767ced24ba4e80b3b8b5 | |
| parent | e4336ab56db1e07a7f3dc08d3a4de3593b0fad22 (diff) | |
| download | openembedded-core-8cf6f87bd753e1c84a018ddb92a97eed7bd79a28.tar.gz openembedded-core-8cf6f87bd753e1c84a018ddb92a97eed7bd79a28.tar.bz2 openembedded-core-8cf6f87bd753e1c84a018ddb92a97eed7bd79a28.zip | |
dbus: Remove hardcoded reference to /usr in System V startup script
Use ${bindir} to locate the binary instead.
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/dbus/dbus-1.6.4/dbus-1.init | 2 | ||||
| -rw-r--r-- | 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 17b58ed18f..64f2170255 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 8f35f56d1b..5c99e11b3c 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" \ |