summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2006-12-27 09:20:01 +0000
committerRoss Burton <ross@openedhand.com>2006-12-27 09:20:01 +0000
commitadb36b3e02b086aceecf416aeed6c5cf8d839895 (patch)
tree1e86dfa62c79c01da4ff8e175876f0f270176573 /meta/conf
parent91dc17787714bd2a08d2f4b18784b778d6f2473a (diff)
downloadpoky-adb36b3e02b086aceecf416aeed6c5cf8d839895.tar.gz
poky-adb36b3e02b086aceecf416aeed6c5cf8d839895.tar.bz2
poky-adb36b3e02b086aceecf416aeed6c5cf8d839895.zip
Define preferred provider for dbus-glib
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1101 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/poky-bleeding.conf2
-rw-r--r--meta/conf/distro/poky.conf1
2 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index cf83f10c55..1ca605aac9 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -7,6 +7,8 @@ PREFERRED_VERSION_gtk+ ?= "2.10.6"
PREFERRED_VERSION_dbus = "1.0.1"
PREFERRED_VERSION_dbus-native = "1.0.1"
+
+PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
PREFERRED_VERSION_dbus-glib = "0.7.2
PREFERRED_VERSION_dbus-glib-native = "0.7.2
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index f3cbd31595..2f090b24ea 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -144,6 +144,7 @@ PREFERRED_VERSION_gtk+ ?= "2.6.8"
PREFERRED_VERSION_pango ?= "1.10.2"
PREFERRED_VERSION_dbus ?= "0.60"
+PREFERRED_PROVIDER_dbus-glib ?= "dbus"
PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
PREFERRED_VERSION_dillo2 ?= "0.6.6"