Revert "gvfs 1.7.2: Drop DEFAULT_PREFERENCE"

Pushed too soon, revert the pins as well.

Signed-off-by: Tom Rini <tom_rini@mentor.com>

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index feaa2a7..85d9a07 100644 (file)
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -19,7 +19,6 @@ PREFERRED_VERSION_gst-pulse   = "0.9.7"
 PREFERRED_VERSION_gtk+         = "2.20.1"
 PREFERRED_VERSION_gtk+-native  = "2.20.1"
 PREFERRED_VERSION_gtkmm                = "2.20.0"
-PREFERRED_VERSION_gvfs         = "1.6.6"
 PREFERRED_VERSION_hal          = "0.5.14"
 PREFERRED_VERSION_libgemwidget = "1.0"
 PREFERRED_VERSION_libgpephone  = "0.4"

diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 0125724..cf0f65d 100644 (file)
--- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -26,7 +26,6 @@ PREFERRED_VERSION_gst-pulse   = "0.9.7"
 PREFERRED_VERSION_gtk+         = "2.20.1"
 PREFERRED_VERSION_gtk+-native  = "2.20.1"
 PREFERRED_VERSION_gtkmm                = "2.20.0"
-PREFERRED_VERSION_gvfs         = "1.6.6"
 PREFERRED_VERSION_hal          = "0.5.14"
 PREFERRED_VERSION_libgemwidget = "1.0"
 PREFERRED_VERSION_libgpephone  = "0.4"

diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 4f1033c..cde3eb0 100644 (file)
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -32,7 +32,6 @@ PREFERRED_VERSION_glib-2.0                    ?= "2.26.1"
 PREFERRED_VERSION_glib-2.0-native              ?= "2.26.1"
 PREFERRED_VERSION_gtk+                         ?= "2.18.6"
 PREFERRED_VERSION_gtk+-native                  ?= "2.18.6"
-PREFERRED_VERSION_gvfs                         ?= "1.6.6"
 PREFERRED_VERSION_ipkg                         ?= "0.99.163"
 PREFERRED_VERSION_ipkg-native                  ?= "0.99.163"
 PREFERRED_VERSION_linux-libc-headers           ?= "2.6.31"

diff --git a/recipes/gnome/gvfs_1.7.2.bb b/recipes/gnome/gvfs_1.7.2.bb
index 3c33537..189f655 100644 (file)
--- a/recipes/gnome/gvfs_1.7.2.bb
+++ b/recipes/gnome/gvfs_1.7.2.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem"
 LICENSE = "LGPLv2"
 DEPENDS = "libcdio gawk-native libimobiledevice gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf samba gphoto2"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit gnome
 
 SRC_URI[archive.md5sum] = "d8a57290a5d090b07cd2f23914f20f4e"