diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-04 20:01:16 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-04 20:01:16 +0000 |
| commit | ae7ce779112e29a0415427e3f2cd0c717ad63d92 (patch) | |
| tree | 4670dea3a040fa3002eaee3ab05210e207f6efda | |
| parent | 5b5e1a3afa79b0d1f9efa0da6807414ec18aeb7c (diff) | |
| download | openembedded-core-ae7ce779112e29a0415427e3f2cd0c717ad63d92.tar.gz openembedded-core-ae7ce779112e29a0415427e3f2cd0c717ad63d92.tar.bz2 openembedded-core-ae7ce779112e29a0415427e3f2cd0c717ad63d92.zip | |
dbus: unbreak buildbot
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3911 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/dbus/dbus-native_1.1.20.bb | 1 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus.inc | 1 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus_1.1.20.bb | 5 |
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 3578572d47..5d04d8d28f 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 5cf5e91069..061bc03323 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 c951fc79ec..b4f43da5e3 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 " |