summaryrefslogtreecommitdiff
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 16:56:51 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 16:56:51 +0000
commitfdb00295bae640081bc06db9126a69b5f5c3859b (patch)
treeeedc884fd55e222a117005f2222f825cd89dcbbf /meta/conf/distro
parent21d430e958610cbc968f59ec7199527496452a01 (diff)
downloadopenembedded-core-fdb00295bae640081bc06db9126a69b5f5c3859b.tar.gz
openembedded-core-fdb00295bae640081bc06db9126a69b5f5c3859b.tar.bz2
openembedded-core-fdb00295bae640081bc06db9126a69b5f5c3859b.tar.xz
openembedded-core-fdb00295bae640081bc06db9126a69b5f5c3859b.zip
poky: use dbus 1.1.20 by default
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3908 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/distro')
-rw-r--r--meta/conf/distro/poky-bleeding.conf3
-rw-r--r--meta/conf/distro/poky.conf4
2 files changed, 2 insertions, 5 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 367c9f11c..f7865137c 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,4 +1 @@
-PREFERRED_VERSION_dbus ?= "1.1.4"
-PREFERRED_VERSION_dbus-native ?= "1.1.4"
-
require conf/distro/poky.conf
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 15eb959ea..cba73a63b 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -206,8 +206,8 @@ PREFERRED_VERSION_cairo ?= "1.4.14"
PREFERRED_VERSION_pango ?= "1.18.3"
PREFERRED_VERSION_gtk+ ?= "2.12.7"
-PREFERRED_VERSION_dbus ?= "1.0.3"
-PREFERRED_VERSION_dbus-native ?= "1.0.3"
+PREFERRED_VERSION_dbus ?= "1.1.20"
+PREFERRED_VERSION_dbus-native ?= "1.1.20"
PREFERRED_VERSION_dbus-glib ?= "0.74"
PREFERRED_VERSION_dbus-glib-native ?= "0.74"
PREFERRED_VERSION_gnome-vfs ?= "2.20.0"