mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

dbus: Remove hardcoded reference to /usr in System V startup script

Browse Source 
Use ${bindir} to locate the binary instead.

(From OE-Core rev: 8cf6f87bd753e1c84a018ddb92a97eed7bd79a28)

Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Phil Blundell
2012-09-22 19:42:17 +01:00
committed by Richard Purdie
parent ddd55085fa
commit 6f32c9ce08
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/dbus/dbus-1.6.4/dbus-1.init
+1 -1
View File
@@ -16,7 +16,7 @@
set -e set -e
DAEMON=/usr/bin/dbus-daemon DAEMON=@bindir@/dbus-daemon
NAME=dbus NAME=dbus
DAEMONUSER=messagebus # must match /etc/dbus-1/system.conf DAEMONUSER=messagebus # must match /etc/dbus-1/system.conf
PIDFILE=/var/run/messagebus.pid # must match /etc/dbus-1/system.conf PIDFILE=/var/run/messagebus.pid # must match /etc/dbus-1/system.conf
meta/recipes-core/dbus/dbus.inc
+3 -2
View File
@@ -10,7 +10,7 @@ DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X
DEPENDS_virtclass-native = "expat-native virtual/libintl-native" DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" 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 \ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://tmpdir.patch; \ file://tmpdir.patch; \
@@ -79,7 +79,8 @@ do_install() {
autotools_do_install autotools_do_install
install -d ${D}${sysconfdir}/init.d 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 install -d ${D}${sysconfdir}/default/volatiles
echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \ echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \