summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/poky-bleeding.conf1
-rw-r--r--meta/conf/distro/poky.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 0f63d3a05c..cf83f10c55 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -14,5 +14,6 @@ SRCDATE_gconf-dbus ?= "20061219"
14 14
15PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs" 15PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs"
16PREFERRED_VERSION_gnome-vfs = "2.16.3" 16PREFERRED_VERSION_gnome-vfs = "2.16.3"
17PREFERRED_PROVIDER_gnome-vfs-plugin-dbus = "gnome-vfs"
17 18
18require conf/distro/poky.conf 19require conf/distro/poky.conf
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 909a66225d..f3cbd31595 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -61,6 +61,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives-native ?= update-alternatives-cwo
61PREFERRED_PROVIDER_libx11 ?= "diet-x11" 61PREFERRED_PROVIDER_libx11 ?= "diet-x11"
62PREFERRED_PROVIDER_gconf ?= "gconf-dbus" 62PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
63PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs-dbus" 63PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs-dbus"
64PREFERRED_PROVIDER_gnome-vfs-plugin-dbus = "gnome-vfs-dbus"
64PREFERRED_PROVIDER_tslib ?= "tslib" 65PREFERRED_PROVIDER_tslib ?= "tslib"
65 66
66 67