chinook-compat.conf:

	* fixed preferred libxml2 version
  * added preference for shared-mime-info
  * add FEED_ARCH to OVERRIDES (like Angstrom)
  * set automake-native preference to 1.10

diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index ff6aa1f..114ab1c 100644 (file)
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -18,6 +18,9 @@ DISTRO_VERSION = "test-${DATE}"
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 
+# Needed for e.g. libffi builds on armv6
+OVERRIDES .= ":${FEED_ARCH}"
+
 require conf/distro/include/angstrom-glibc.inc
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1"
 
@@ -57,7 +60,7 @@ PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libx11 = "libx11"
 PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
 
-PREFERRED_VERSION_automake-native = "1.9.6"
+PREFERRED_VERSION_automake-native = "1.10"
 
 PREFERRED_VERSION_binutils = "2.17.50.0.12"
 PREFERRED_VERSION_binutils-cross    = "2.18"
@@ -98,7 +101,7 @@ PREFERRED_VERSION_gnome-vfs        = "2.16.3"
 
 # 3.9.1 would be correct
 PREFERRED_VERSION_gtkhtml-3.8      = "3.8.2"
-PREFERRED_VERSION_libxml2          = "2.6.27"
+PREFERRED_VERSION_libxml2          = "2.7.2""
 # 2.16 would be correct
 PREFERRED_VERSION_gconf            = "2.6.1"
 
@@ -172,6 +175,8 @@ PREFERRED_VERSION_hildon-thumbnail = "0.14"
 PREFERRED_VERSION_osso-gwconnect = "1.0.12"
 PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
 
+PREFERRED_VERSION_shared-mime-info = "0.22"
+
 # Java stuff 
 PREFERRED_PROVIDER_midpath = "midpath-maemo"
 PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"