14 files changed, 185 insertions, 54 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 8b9b58ebc5..821a3a1ce5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1554,9 +1554,9 @@ sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057
 md5=c0b57a115e24005f9828ca7b53908779
 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd
 
-[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz]
-md5=4476c423b8f74266136964e42ea88028
-sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
+[http://www.cmake.org/files/v2.4/cmake-2.4.8.tar.gz]
+md5=f5dd061c31765a49dc17ae8bdc986779
+sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1
 
 [ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz]
 md5=4cd3ce38efbd27c6cf4223f0ced2a5b5
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
new file mode 100644
index 0000000000..05dc674c13
--- /dev/null
+++ b/conf/distro/chinook-compat.conf
@@ -0,0 +1,166 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Chinook-compatible
+#@--------------------------------------------------------------------
+
+DISTRO = "chinook-compat"
+DISTRO_NAME = "Chinook-compat"
+DISTRO_VERSION = "test-${DATE}"
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+
+require conf/distro/include/angstrom-glibc.inc
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1"
+
+INHERIT += "package_deb debian"
+TARGET_OS  = "linux-gnueabi"
+
+TARGET_FPU_nokia770 = "soft"
+TARGET_FPU_nokia800 = "hard"
+
+DPKG_ARCH_nokia770 = "armel"
+DPKG_ARCH_nokia800 = "armel"
+
+FEED_ARCH_nokia770	= "armv5te"
+
+# Actually n800 is armv6 but we are using armv5te because qemu does not emulate
+# armv6 yet. 
+FEED_ARCH_nokia800		= "armv5te"
+#FEED_ARCH_nokia800		= "armv6"
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+
+# NPTL stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+
+PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-header"
+
+PREFERRED_VERSION_automake-native = "1.9.6"
+
+PREFERRED_VERSION_binutils = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross    = "2.18"
+
+PREFERRED_VERSION_gcc = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
+
+# Use recent enough version of the headers to let HAL build successfully.
+PREFERRED_VERSION_linux-libc-headers = "2.6.20"
+
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+PREFERRED_VERSION_glibc-initial = "2.5"
+
+PREFERRED_VERSION_libtool = "1.5.6"
+
+require conf/distro/include/sane-srcrevs.inc
+
+PREFERRED_VERSION_fontconfig       = "2.4.1"
+PREFERRED_VERSION_freetype         = "2.2.1"
+PREFERRED_VERSION_freetype-native  = "2.2.1"
+PREFERRED_VERSION_cairo            = "1.4.10"
+PREFERRED_VERSION_glib-2.0         = "2.12.12"
+PREFERRED_VERSION_pango            = "1.16.4"
+PREFERRED_VERSION_atk              = "1.18.0"
+PREFERRED_VERSION_gtk+             = "2.10.14"
+
+PREFERRED_VERSION_gnome-vfs        = "2.16"
+# 3.9.1 would be correct
+PREFERRED_VERSION_gtkhtml-3.8      = "3.8.2"
+# 2.6.27 would be correct
+PREFERRED_VERSION_libxml           = "2.6.29"
+# 2.16 would be correct
+PREFERRED_VERSION_gconf            = "2.6.1"
+
+# gstreamer
+# 0.10.13 would be correct (+ maemo patches)
+PREFERRED_VERSION_gstreamer        = "0.10.14"
+PREFERRED_VERSION_gst-plugins-good = "0.10.6"
+# 0.10.13 would be correct (+ maemo patches)
+PREFERRED_VERSION_gst-plugins-base = "0.10.14"
+# 0.11.3 would be correct ( + maemo patches)
+PREFERRED_VERSION_gst-ffmpeg       = "0.10.2"
+
+PREFERRED_PROVIDER_virtual/db           = "db"
+PREFERRED_PROVIDER_virtual/db-native    = "db-native"
+PREFERRED_PROVIDER_virtual/xserver      = "xserver-kdrive"
+
+# This is a hack to avoid building mesa which crashes the compiler
+PREFERRED_PROVIDER_virtual/libsdl       = "libsdl-directfb"
+
+PREFERRED_PROVIDER_xserver          = "xserver-kdrive"
+
+PREFERRED_VERSION_xserver-kdrive    = "1.3.0.0"
+PREFERRED_VERSION_libxrandr         = "1.2.1"
+PREFERRED_VERSION_xrandr            = "1.2.0"
+PREFERRED_VERSION_randrproto        = "1.2.1"
+
+PREFERRED_VERSION_libgnomeui         = "2.18.1"
+
+PREFERRED_PROVIDER_gtk+                   = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif  = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico  = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx  = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png  = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm  = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras  = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga  = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  = "gtk+"
+
+PREFERRED_PROVIDER_gconf                  = "gconf"
+
+PREFERRED_VERSION_pixman                  = "0.9.6"
+
+PREFERRED_PROVIDER_virtual/libqte2	  = "qte-mt"
+PREFERRED_PROVIDER_avahi		  = "avahi"
+
+# Prevent chosing jikes-native (until java bootstrap patch is merged).
+PREFERRED_PROVIDER_virtual/javac-native	  = "ecj-bootstrap-native"
+
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
+
+PREFERRED_VERSION_libsoup = "2.2.7"
+PREFERRED_VERSION_libglade = "2.4.2"
+PREFERRED_VERSION_gnutls = "1.4.5"
+PREFERRED_VERSION_libgpg-error = "1.0"
+PREFERRED_VERSION_libgcrypt = "1.2.3"
+
+PREFERRED_VERSION_gpe-scap = "1.3"
+
+# Does not compile with the CodeSourcery compiler .. :(
+PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
+PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
+
+# WARNING: If you change these values after the respective package has
+# been built the change will have no effect. Edit the package's file in 
+# ${STAGING}/pkgdata/runtime then.
+PKG_ncurses = "libncurses5"
+PKG_ncurses-tools = "ncurses-bin"
+PKG_ncurses-terminfo = "ncurses-base"
+
+PKG_gtk+ = "libgtk2.0-0"
+PKG_pango = "libpango1.0-0"
+PKG_atk = "libatk1.0-0"
+PKG_glib-2.0 = "libglib2.0-0"
+PKG_gconf = "libgconf2-6"
+DEBIANNAME_dbus_pn-dbus = "dbus"
+PKG_hildon-1 = "libhildon1"
+
+PKG_zlib = "zlib1g"
+PKG_libglade = "libglade2-0"
+PKG_libsoup = "libsoup2.2-8"
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 156b5b21a3..02e2399e4e 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -509,7 +509,7 @@ PREFERRED_VERSION_gnomesword ?= "2.1.2"
 PREFERRED_VERSION_gnuchess ?= "5.05"
 PREFERRED_VERSION_gnumeric ?= "1.6.3"
 PREFERRED_VERSION_gnupg ?= "1.4.2.2"
-PREFERRED_VERSION_gnuplot ?= "4.2.0"
+PREFERRED_VERSION_gnuplot ?= "4.2.2"
 PREFERRED_VERSION_gnuradio ?= "3.0.4"
 PREFERRED_VERSION_gnutls ?= "1.6.3"
 PREFERRED_VERSION_gob2 ?= "2.0.14"
diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf
deleted file mode 100644
index b8592fdf68..0000000000
--- a/conf/distro/maemo-1.0.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-require conf/distro/include/familiar.inc
-
-DISTRO = "maemo"
-DISTRO_NAME = "Maemo Linux"
-DISTRO_VERSION = "v1.0b-${DATE}"
-
-DISTRO_TYPE = "debug"
-#DISTRO_TYPE = "release"
-
-FEED_URIS += " \
-		"
-#SRCDATE = 20050331
-
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-#PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
-#PREFERRED_VERSION_gcc-cross = "3.4.4"
-#PREFERRED_VERSION_gcc-cross-initial = "3.4.4
-#PREFERRED_VERSION_libtool-native = "1.5.6"
-#PREFERRED_VERSION_libtool-cross= "1.5.6"
-
-#
-# GPE
-#
-
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-
-require conf/distro/include/preferred-gpe-versions.inc
-
-#
-# Maemo
-#
-
-require conf/distro/include/maemo-preferred.inc
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 04e0e83051..5170f8993e 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,10 +3,10 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
-TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/tune-strongarm.inc
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 6f0e37b803..c037226154 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
 
 # h3700, h3800 have 32, but let that be the bonus
 ROOT_FLASH_SIZE = "16"
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
index 515700d9e6..34255a1536 100644
--- a/conf/machine/htcwallaby.conf
+++ b/conf/machine/htcwallaby.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
 
 ROOT_FLASH_SIZE = "16" 
 VOLATILE_STORAGE_SIZE = "32"
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
new file mode 100644
index 0000000000..448b28c91f
--- /dev/null
+++ b/conf/machine/include/tune-strongarm.inc
@@ -0,0 +1,6 @@
+# This machine lists common configuration options for Strongarm devices
+# gcc does not differentiate between the different Strongarm versions, so neither do we
+# http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html
+
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
+
diff --git a/conf/machine/include/tune-strongarm1100.inc b/conf/machine/include/tune-strongarm1100.inc
deleted file mode 100644
index f136710409..0000000000
--- a/conf/machine/include/tune-strongarm1100.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# This machine lists common configuration options for Strongarm 1100 devices
-# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
-
-TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100"
-
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 2037931803..f6d1ec0d8e 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -32,6 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-px
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
+MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
+	kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS_collie = "smallscreen"
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index a42dd8c127..72fff1ed5e 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index ee9117e406..8741eb4ff6 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index 87c260856d..d7d35cfda1 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
 ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
 
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
 MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index e187ee1e75..6334d34171 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
 
 include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
 
 
 ROOT_FLASH_SIZE = "16"