---
conf/distro/include/preferred-shr-versions.inc | 5 ++---
conf/machine/om-gta01.conf | 2 ++
conf/machine/om-gta02.conf | 2 ++
recipes/tasks/task-fso-compliance.bb | 1 -
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/conf/distro/include/preferred-shr-versions.inc
b/conf/distro/include/preferred-shr-versions.inc
index 6b1d3bf..2052577 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -469,8 +469,8 @@ PREFERRED_VERSION_glib-1.2 ?= "1.2.10"
PREFERRED_VERSION_glib-1.2-native ?= "1.2.10"
PREFERRED_VERSION_glib-2.0 ?= "2.22.1"
PREFERRED_VERSION_glib-2.0-native ?= "2.22.1"
-PREFERRED_VERSION_glibc ?= "2.7"
-PREFERRED_VERSION_glibc-initial ?= "2.7"
+PREFERRED_VERSION_glibc ?= "2.9"
+PREFERRED_VERSION_glibc-initial ?= "2.9"
PREFERRED_VERSION_glibmm ?= "2.22.1"
PREFERRED_VERSION_glider ?= "1.0.0"
PREFERRED_VERSION_gloox ?= "0.8.9"
@@ -846,7 +846,6 @@ PREFERRED_VERSION_libdigest-sha1-perl-native ?= "2.11"
PREFERRED_VERSION_libdisplaymigration ?= "0.99"
PREFERRED_VERSION_libdmx ?= "1.0.2"
PREFERRED_VERSION_libdotdesktop ?= "0.11"
-PREFERRED_VERSION_libdrm ?= "2.4.11"
PREFERRED_VERSION_libdvb ?= "0.5.5.1"
PREFERRED_VERSION_libdvdnav ?= "0.1.10"
PREFERRED_VERSION_libdvdread ?= "0.9.6"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index cbc66d8..4b9dc5e 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -9,6 +9,8 @@ TARGET_ARCH = "arm"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
UBOOT_ENTRYPOINT = "30008000"
+OLDEST_KERNEL ?= "2.6.29"
+
MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone
vfat ext2"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index ca45ddf..8b1b76f 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -10,6 +10,8 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-stable"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive-glamo"
UBOOT_ENTRYPOINT = "30008000"
+OLDEST_KERNEL ?= "2.6.29"
+
MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone
wifi vfat ext2"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
diff --git a/recipes/tasks/task-fso-compliance.bb
b/recipes/tasks/task-fso-compliance.bb
index 0f00c2b..e1776a8 100644
--- a/recipes/tasks/task-fso-compliance.bb
+++ b/recipes/tasks/task-fso-compliance.bb
@@ -24,7 +24,6 @@ RDEPENDS_${PN} = "\
# connman-plugin-resolvconf \
connman-plugin-udhcp \
connman-plugin-wifi \
- connman-test-utils \
"
RRECOMMENDS_${PN} = "\
--
1.6.4.3
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
