merge of 'dbc92be1fe4742c442c336c46478ebc072b977ed'

     and 'f37c4d25879e2b68bedfa992671306a142e8181d'

82 files changed, 233 insertions, 2067 deletions

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/packages/qemu/files/.mtn2git_empty b/packages/qemu/qemu-0.9.0+cvs20070613/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qemu/files/.mtn2git_empty
+++ b/packages/qemu/qemu-0.9.0+cvs20070613/.mtn2git_empty
diff --git a/packages/qemu/files/02_snapshot_use_tmpdir.patch b/packages/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch
index bd955b6db3..bd955b6db3 100644
--- a/packages/qemu/files/02_snapshot_use_tmpdir.patch
+++ b/packages/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch
diff --git a/packages/qemu/files/03_machines_list_no_error.patch b/packages/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch
index 73f31550fe..73f31550fe 100644
--- a/packages/qemu/files/03_machines_list_no_error.patch
+++ b/packages/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch
diff --git a/packages/qemu/files/04_do_not_print_rtc_freq_if_ok.patch b/packages/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch
index 1575cbce63..1575cbce63 100644
--- a/packages/qemu/files/04_do_not_print_rtc_freq_if_ok.patch
+++ b/packages/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch
diff --git a/packages/qemu/files/05_non-fatal_if_linux_hd_missing.patch b/packages/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch
index b7c4732f24..b7c4732f24 100644
--- a/packages/qemu/files/05_non-fatal_if_linux_hd_missing.patch
+++ b/packages/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch
diff --git a/packages/qemu/files/06_exit_segfault.patch b/packages/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch
index 447c3550b8..447c3550b8 100644
--- a/packages/qemu/files/06_exit_segfault.patch
+++ b/packages/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch
diff --git a/packages/qemu/files/10_signal_jobs.patch b/packages/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch
index 794a538676..794a538676 100644
--- a/packages/qemu/files/10_signal_jobs.patch
+++ b/packages/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch
diff --git a/packages/qemu/files/11_signal_sigaction.patch b/packages/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch
index 5446efc562..5446efc562 100644
--- a/packages/qemu/files/11_signal_sigaction.patch
+++ b/packages/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch
diff --git a/packages/qemu/files/12_signal_powerpc_support.patch b/packages/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch
index d8d4198784..d8d4198784 100644
--- a/packages/qemu/files/12_signal_powerpc_support.patch
+++ b/packages/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch
diff --git a/packages/qemu/files/22_net_tuntap_stall.patch b/packages/qemu/qemu-0