From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 12 Nov 2009 22:41:14 +0000 (+0000)
Subject: dbus-native: Apply install fix patch to ensure the version of dbus-daemon in staging... 
X-Git-Tag: 2011-1~6877
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ce3ef9f4e87cecbf181fb09696f39885f6087a21;p=openembedded-core.git

dbus-native: Apply install fix patch to ensure the version of dbus-daemon in staging is not a wrapper

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/meta/packages/dbus/dbus-native_1.2.14.bb b/meta/packages/dbus/dbus-native_1.2.14.bb
index d799ba2d1d..425e5b2918 100644
--- a/meta/packages/dbus/dbus-native_1.2.14.bb
+++ b/meta/packages/dbus/dbus-native_1.2.14.bb
@@ -3,7 +3,7 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
-PR = "r3"
+PR = "r4"
 
 do_stage() {
 	oe_runmake install
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index d799ba2d1d..425e5b2918 100644
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -3,7 +3,7 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
-PR = "r3"
+PR = "r4"
 
 do_stage() {
 	oe_runmake install
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index 7d72502ad7..f425f883eb 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -8,6 +8,7 @@ SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
+  file://fix-install-daemon.patch;patch=1 \
   file://dbus-1.init \
   file://99_dbus \
 "
diff --git a/meta/packages/dbus/dbus_1.2.14.bb b/meta/packages/dbus/dbus_1.2.14.bb
index b170e7b340..ae8772625a 100644
--- a/meta/packages/dbus/dbus_1.2.14.bb
+++ b/meta/packages/dbus/dbus_1.2.14.bb
@@ -3,5 +3,3 @@ include dbus.inc
 PR = "r1"
 
 inherit update-rc.d
-
-SRC_URI += "file://fix-install-daemon.patch;patch=1 "
diff --git a/meta/packages/dbus/dbus_1.2.4.bb b/meta/packages/dbus/dbus_1.2.4.bb
index b170e7b340..ae8772625a 100644
--- a/meta/packages/dbus/dbus_1.2.4.bb
+++ b/meta/packages/dbus/dbus_1.2.4.bb
@@ -3,5 +3,3 @@ include dbus.inc
 PR = "r1"
 
 inherit update-rc.d
-
-SRC_URI += "file://fix-install-daemon.patch;patch=1 "