summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 20:01:16 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 20:01:16 +0000
commitae7ce779112e29a0415427e3f2cd0c717ad63d92 (patch)
tree4670dea3a040fa3002eaee3ab05210e207f6efda /meta/packages
parent5b5e1a3afa79b0d1f9efa0da6807414ec18aeb7c (diff)
downloadopenembedded-core-ae7ce779112e29a0415427e3f2cd0c717ad63d92.tar.gz
openembedded-core-ae7ce779112e29a0415427e3f2cd0c717ad63d92.tar.bz2
openembedded-core-ae7ce779112e29a0415427e3f2cd0c717ad63d92.tar.xz
openembedded-core-ae7ce779112e29a0415427e3f2cd0c717ad63d92.zip
dbus: unbreak buildbot
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3911 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/dbus/dbus-native_1.1.20.bb1
-rw-r--r--meta/packages/dbus/dbus.inc1
-rw-r--r--meta/packages/dbus/dbus_1.1.20.bb5
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/packages/dbus/dbus-native_1.1.20.bb b/meta/packages/dbus/dbus-native_1.1.20.bb
index 3578572d4..5d04d8d28 100644
--- 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 5cf5e9106..061bc0332 100644
--- 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 c951fc79e..b4f43da5e 100644
--- 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 "