dbus: unbreak buildbot

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3911 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/dbus/dbus-native_1.1.20.bb b/meta/packages/dbus/dbus-native_1.1.20.bb
index 3578572d47e6107d6b747cdd91691caafb244dda..5d04d8d28fdf4bdbb0a8cf8bb638c068a6effb61 100644 (file)
--- a/meta/packages/dbus/dbus-native_1.1.20.bb
+++ b/meta/packages/dbus/dbus-native_1.1.20.bb
@@ -3,6 +3,7 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
+PR = "r1"
 
 do_stage() {
        oe_runmake install

diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index 5cf5e9106968efcd6624d39e75fecc36b1f154e3..061bc0332350e12dc3a17d9410908da3810cc079 100644 (file)
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -8,7 +8,6 @@ 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 \
 "
 S = "${WORKDIR}/dbus-${PV}"

diff --git a/meta/packages/dbus/dbus_1.1.20.bb b/meta/packages/dbus/dbus_1.1.20.bb
index c951fc79ecc9dd4eea87a17b63e11a21a36ae9f1..b4f43da5e334cbea6f883320a0080aa57994d9cd 100644 (file)
--- a/meta/packages/dbus/dbus_1.1.20.bb
+++ b/meta/packages/dbus/dbus_1.1.20.bb
@@ -1,5 +1,6 @@
 include dbus.inc
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
+SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1 \
+            file://fix-install-daemon.patch;patch=1 "