conf/distro: Update PREFERRED_VERSIONs

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index d43a881c1cbced5dfe156f3d77ef9d51e07eacbb..36120e2ca92cba7ae1bbb56fe9e548d3fdfdc5b0 100644 (file)
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -209,12 +209,11 @@ PREFERRED_VERSION_dbus-glib ?= "0.78"
 PREFERRED_VERSION_dbus-glib-native ?= "0.78"
 PREFERRED_VERSION_gnome-vfs ?= "2.22.0"
 PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
-PREFERRED_VERSION_gnome-keyring ?= "2.20"
 
 PREFERRED_VERSION_evince ?= "2.20.0"
 PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}"
 PREFERRED_VERSION_oprofile ?= "0.9.4"
 PREFERRED_VERSION_elfutils ?= "0.89"
-PREFERRED_VERSION_hal ?= "0.5.9.1"
+PREFERRED_VERSION_hal ?= "0.5.11"
 PREFERRED_VERSION_hal-info ?= "20070831"
 

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index d076aca26f003f1bc46f251c0f396dfec5c52eba..4e873e036d3af32067c742cd60ce8adea93d0358 100644 (file)
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -146,6 +146,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.2.1"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2"
 PREFERRED_VERSION_xf86-input-synaptics ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.4.97.0+git${SRCREV}"
-PREFERRED_VERSION_xf86-video-intel-dri2 ?= "2.4.97.0+git${SRCREV}"
+PREFERRED_VERSION_xf86-video-intel ?= "2.7.0"
+