* [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script
@ 2012-09-22 18:42 Phil Blundell
2012-09-23 19:45 ` Colin Walters
2012-09-24 10:16 ` Richard Purdie
0 siblings, 2 replies; 5+ messages in thread
From: Phil Blundell @ 2012-09-22 18:42 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script
2012-09-22 18:42 [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script Phil Blundell
@ 2012-09-23 19:45 ` Colin Walters
2012-09-23 20:22 ` Paul Eggleton
2012-09-24 10:16 ` Richard Purdie
1 sibling, 1 reply; 5+ messages in thread
From: Colin Walters @ 2012-09-23 19:45 UTC (permalink / raw)
To: Phil Blundell; +Cc: openembedded-core
On Sat, 2012-09-22 at 19:42 +0100, Phil Blundell wrote:
> - 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
Does that actually work? The variable reference is inside single quotes
so it won't be expanded by the shell, right?
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script
2012-09-23 19:45 ` Colin Walters
@ 2012-09-23 20:22 ` Paul Eggleton
2012-09-23 22:00 ` Colin Walters
0 siblings, 1 reply; 5+ messages in thread
From: Paul Eggleton @ 2012-09-23 20:22 UTC (permalink / raw)
To: Colin Walters; +Cc: openembedded-core
On Sunday 23 September 2012 15:45:20 Colin Walters wrote:
> On Sat, 2012-09-22 at 19:42 +0100, Phil Blundell wrote:
> > - 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
> Does that actually work? The variable reference is inside single quotes
> so it won't be expanded by the shell, right?
What is being expanded here at parse time is a bitbake variable rather than a
shell variable, so it should work fine.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script
2012-09-22 18:42 [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script Phil Blundell
2012-09-23 19:45 ` Colin Walters
@ 2012-09-24 10:16 ` Richard Purdie
1 sibling, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2012-09-24 10:16 UTC (permalink / raw)
To: Phil Blundell; +Cc: openembedded-core
On Sat, 2012-09-22 at 19:42 +0100, Phil Blundell wrote:
> 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(-)
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-24 10:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-22 18:42 [PATCH] dbus: Remove hardcoded reference to /usr in System V startup script Phil Blundell
2012-09-23 19:45 ` Colin Walters
2012-09-23 20:22 ` Paul Eggleton
2012-09-23 22:00 ` Colin Walters
2012-09-24 10:16 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox