[oe-commits] Otavio Salvador : dbus: fix init script if $prefix is empty

git version control git at git.openembedded.org
Wed Feb 16 17:56:20 UTC 2011


Module: openembedded.git
Branch: shr/testing2011.1
Commit: 199b5805be4af87515d5617452164b6ddbabd077
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=199b5805be4af87515d5617452164b6ddbabd077

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Fri Jan 14 13:54:35 2011 -0200

dbus: fix init script if $prefix is empty

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>

---

 recipes/dbus/dbus.inc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc
index 73fc426..86dc62b 100644
--- a/recipes/dbus/dbus.inc
+++ b/recipes/dbus/dbus.inc
@@ -4,7 +4,7 @@ SECTION = "base"
 LICENSE = "GPLv2+ AFLv2.1"
 DEPENDS = "expat glib-2.0 virtual/libintl libsm libice virtual/libx11"
 
-INC_PR = "r19"
+INC_PR = "r20"
 
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz;name=dbus \
@@ -52,6 +52,11 @@ do_install_append() {
                 install -d  ${D}${libexecdir}/
                 install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
         fi
+
+        # Handle case where prefix is empty
+        if [ -z "$prefix" ]; then
+                sed -i 's,/usr,,g' ${D}${sysconfdir}/init.d/dbus-1
+        fi
 }
 
 RDEPENDS_${PN}-x11 = "${PN}"





More information about the Openembedded-commits mailing list