From: Phil Blundell <philb@gnu.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script
Date: Sat, 22 Sep 2012 19:42:17 +0100 [thread overview]
Message-ID: <1348339337.4444.229.camel@x121e.pbcl.net> (raw)
Use ${bindir} to locate the binary instead.
Signed-off-by: Phil Blundell <pb@pbcl.net>
---
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" \
--
1.7.9
next reply other threads:[~2012-09-22 18:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-22 18:42 Phil Blundell [this message]
2012-09-23 19:45 ` [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script Colin Walters
2012-09-23 20:22 ` Paul Eggleton
2012-09-23 22:00 ` Colin Walters
2012-09-24 10:16 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348339337.4444.229.camel@x121e.pbcl.net \
--to=philb@gnu.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox