| Submitter | Phil Blundell |
|---|---|
| Date | Sept. 22, 2012, 6:42 p.m. |
| Message ID | <1348339337.4444.229.camel@x121e.pbcl.net> |
| Download | mbox | patch |
| Permalink | /patch/37075/ |
| State | Accepted |
| Commit | 8cf6f87bd753e1c84a018ddb92a97eed7bd79a28 |
| Headers | show |
Comments
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?
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
On Sun, 2012-09-23 at 21:22 +0100, Paul Eggleton wrote: > What is being expanded here at parse time is a bitbake variable rather than a > shell variable, so it should work fine. Ok, sorry for the noise.
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
Patch
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" \
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(-)