merge of '8dccbf106093aaa7b62b2a96962945185534c923'

     and 'c50825ba187c292f591cf43c91216cebffb5e290'

36 files changed, 624 insertions, 115 deletions

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 25b07e0038..7935672795 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -1,4 +1,3 @@
-DISTRO = "amsdelta-oe"
 DISTRO_NAME = "AmsDelta Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2008.1-legacy.conf
index 358ed06cf2..358ed06cf2 100644
--- a/conf/distro/angstrom-2007.1-legacy.conf
+++ b/conf/distro/angstrom-2008.1-legacy.conf
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index ec8a5b9b30..b24a57f537 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -22,6 +22,7 @@ DISTRO_REVISION = "1"
 
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/angstrom-2008-preferred-versions.inc
 
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace included
@@ -71,15 +72,9 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
 
 
 #Prefer a newer GTK+ and friends
-PREFERRED_VERSION_gtk+             	= "2.12.0"
-PREFERRED_VERSION_glib-2.0              = "2.14.0"
-PREFERRED_VERSION_pango                 = "1.18.1"
-
-# prefer newest for speed and fun
-PREFERRED_VERSION_udev			= "115"
-
-# Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable
-PREFERRED_VERSION_busybox               = "1.7.2" 
+PREFERRED_VERSION_gtk+             	?= "2.12.3"
+PREFERRED_VERSION_glib-2.0              ?= "2.14.4"
+PREFERRED_VERSION_pango                 ?= "1.18.1"
 
 PREFERRED_PROVIDER_avahi = "avahi"
 
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
new file mode 100644
index 0000000000..c439ad67f6
--- /dev/null
+++ b/conf/distro/chinook-compat.conf
@@ -0,0 +1,199 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Chinook-compatible
+#@DESCRIPTION: Distribution which allows building packages compatible to OS 2008
+#@--------------------------------------------------------------------
+
+# Note: This is not a complete distribution. Just some definitions to make
+# it possible to build packages that are compatible to Nokia's OS2008.
+# You should *not* replace core libraries of the operating system (glibc,
+# glib, gtk+, ..) with those you build in OE.
+#
+# Furthermore it may be possible that OpenEmbedded lacks specific versions
+# of some packages. If you encounter such a problem please provide a recipe
+# or file a bug!
+
+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"
+
+# 3.9.1 would be correct
+PREFERRED_VERSION_gtkhtml-3.8      = "3.8.2"
+PREFERRED_VERSION_libxml2          = "2.6.27"
+# 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_VERSION_bluez-libs            = "3.20"
+
+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_VERSION_libsdl-directfb       = "1.2.9"
+PREFERRED_VERSION_libsdl-image          = "1.2.3"
+
+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"
+
+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"
+
+# various Maemo4 specific libraries
+PREFERRED_VERSION_mce-dev = "1.6.3"
+PREFERRED_VERSION_libosso = "2.13"
+PREFERRED_VERSION_libhildon = "1.99.0"
+PREFERRED_VERSION_libhildonmime = "1.10.0"
+PREFERRED_VERSION_libhildonfm = "1.9.46"
+PREFERRED_VERSION_hildon-thumbnail = "0.14"
+PREFERRED_VERSION_osso-gwconnect = "1.0.12"
+PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
+
+# Java stuff 
+
+PREFERRED_PROVIDER_virtual/javac-native	  = "ecj-bootstrap-native"
+
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
+PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
+
+# 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"
+
+PKG_libsdl-image = "libsdl-image1.2"
+PKG_libsdl-directfb = "libsdl1.2"
+
+PKG_bluez-libs = "libbluetooth2"
+
+PKG_osso-ic-oss = "osso-ic"
+PKG_libconic = "libconic0"
diff --git a/conf/distro/colinuxoe.conf b/conf/distro/colinuxoe.conf
index 7454c0167f..25ea04a1f5 100644
--- a/conf/distro/colinuxoe.conf
+++ b/conf/distro/colinuxoe.conf
@@ -2,6 +2,8 @@
 #@NAME: coLinuxoe
 #@DESCRIPTION: Generic OE built distro for the coLinux MACHINE
 
+TARGET_OS = "linux"
+
 INHERIT += "package_ipk debian"
 
 # MACHINE decides that linux-colinux is the correct kernel.
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index fe079db92d..8e26a282ab 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -10,7 +10,6 @@ FOONAS_MODE ?= "glibc"
 ANGSTROM_MODE = ${FOONAS_MODE}
 require conf/distro/angstrom-2008.1.conf
 
-DISTRO = "foonas"
 DISTRO_NAME = "foonas"
 DISTRO_VERSION = "1.0-dev"
 DISTRO_REVISION = "1"
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf
index 26e78f89c1..805cfe7955 100644
--- a/conf/distro/generic-uclibc.conf
+++ b/conf/distro/generic-uclibc.conf
@@ -27,3 +27,10 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
 PREFERRED_PROVIDER_virtual/libintl = "libintl"
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+
+PREFERRED_VERSION_uclibc = "0.9.29"
+PREFERRED_VERSION_uclibc-initial = "0.9.29"
+
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 0286666495..d67be1d738 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -36,28 +36,34 @@ MACHINE_KERNEL_VERSION = "2.6"
 #
 # Binutils & Compiler
 #
-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/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
 PREFERRED_VERSION_gcc ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils ?= "2.18"
+PREFERRED_VERSION_binutils-cross ?= "2.18"
 
 #
 # Target OS & FPU system
-# 
+#
 TARGET_OS = "linux"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
 
+#
+# C library
+#
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 PREFERRED_PROVIDER_virtual/libc = "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.23"
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 
@@ -65,28 +71,12 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 # Bootstrap & Init
 #
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
 #
-# GPE
+# Preferred versions
 #
-require conf/distro/include/preferred-gpe-versions-2.8.inc
 
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-require conf/distro/include/preferred-opie-versions.inc
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
 
-#
-# Enlightenment
-#
-require conf/distro/include/preferred-e-versions.inc
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
index 156b5b21a3..6cabe8164c 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko-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"
@@ -548,7 +548,7 @@ PREFERRED_VERSION_gpe-irc ?= "0.08"
 PREFERRED_VERSION_gpe-keylock ?= "0.12"
 PREFERRED_VERSION_gpe-life ?= "0.2"
 PREFERRED_VERSION_gpe-lights ?= "0.13"
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
 PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
 PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17"
 PREFERRED_VERSION_gpe-mininet ?= "0.7"
@@ -886,7 +886,7 @@ PREFERRED_VERSION_libgalago ?= "0.3.3"
 PREFERRED_VERSION_libgc ?= "6.7"
 PREFERRED_VERSION_libgcrypt ?= "1.2.3"
 PREFERRED_VERSION_libgeda ?= "20050820"
-PREFERRED_VERSION_libgemwidget ?= "0.1"
+PREFERRED_VERSION_libgemwidget ?= "1.0"
 PREFERRED_VERSION_libglade ?= "2.6.2"
 PREFERRED_VERSION_libglademm ?= "2.4.1"
 PREFERRED_VERSION_libgmime ?= "2.1.7"
@@ -918,7 +918,7 @@ PREFERRED_VERSION_libhildonfm ?= "1.9.41"
 PREFERRED_VERSION_libhildonhelp ?= "1.9.1"
 PREFERRED_VERSION_libhildonmime ?= "1.9.5"
 PREFERRED_VERSION_libhtml-mason-perl ?= "1.35"
-PREFERRED_VERSION_libiac ?= "0.1"
+PREFERRED_VERSION_libiac ?= "1.0"
 PREFERRED_VERSION_libice ?= "1.0.4"
 PREFERRED_VERSION_libiconv ?= "1.11"
 PREFERRED_VERSION_libid3 ?= "1.1"
@@ -946,7 +946,7 @@ PREFERRED_VERSION_libmailwrapper ?= "1.2.3"
 PREFERRED_VERSION_libmatchbox ?= "1.9"
 PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18"
 PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
-PREFERRED_VERSION_libmimedir ?= "0.3.1"
+PREFERRED_VERSION_libmimedir ?= "0.4.2"
 PREFERRED_VERSION_libmng ?= "1.0.8"
 PREFERRED_VERSION_libmodplug ?= "0.7"
 PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 380c882c2c..08cf27ba57 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -146,7 +146,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-xorg-versions.inc
-require conf/distro/include/angstrom-2007-preferred-versions.inc
+require conf/distro/include/angstrom-2007-for-openmoko-versions.inc
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
new file mode 100644
index 0000000000..b8685a578e
--- /dev/null
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -0,0 +1,8 @@
+PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.10"
+
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 1502833389..d14c6f1b19 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -3,6 +3,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
 PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
 
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 59d40957d5..7e8e60d7dd 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -14,5 +14,10 @@ TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARC
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
 BUILD_OPTIMIZATION = "-Os"
+
+#Gcc will die with 'internal consistency error when using the above optimizations
+FULL_OPTIMIZATION_avr32 = ""
+BUILD_OPTIMIZATION_avr32 = ""
+
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index aff3ba90d1..d55b5bf3db 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -2,6 +2,8 @@
 #@NAME: Angstrom 
 #@DESCRIPTION: Release independent distribution configuration for Angstrom
 
+# Preserve original DISTRO value
+USERDISTRO := "${DISTRO}"
 DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
 
@@ -10,6 +12,7 @@ TARGET_VENDOR = "-angstrom"
 # Can be "glibc", "eglibc" or "uclibc"
 ANGSTROM_MODE ?= "glibc"
 
+CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}"
 DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
 require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
 
@@ -50,6 +53,8 @@ TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
 TARGET_FPU_ixp4xx ?= "soft"
 
+TARGET_FPU_dht-walnut ?= "soft"
+
 #Set the right arch for the feeds
 #Alphabetically sorted
 
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index e039a144d3..f9941c8a9a 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -9,6 +9,7 @@ SRCREV_pn-ezxd ?= "${AUTOREV}"
 SRCREV_pn-fbgrab-viewer-native ?= "${AUTOREV}"
 SRCREV_pn-fstests ?= "${AUTOREV}"
 SRCREV_pn-gnuradio ?= "${AUTOREV}"
+SRCREV_pn-gtkhtml2 ?= "${AUTOREV}"
 SRCREV_pn-hildon-1 ?= "${AUTOREV}"
 SRCREV_pn-kismet ?= "${AUTOREV}"
 SRCREV_pn-kismet-newcore ?= "${AUTOREV}"
@@ -81,6 +82,8 @@ SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
 SRCREV_pn-psplash ?= "${AUTOREV}"
 SRCREV_pn-settings-daemon ?= "${AUTOREV}"
 SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index fb9e2815ba..55e51409be 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -32,7 +32,7 @@ PREFERRED_VERSION_libxsettings-client ?= "0.17"
 
 PREFERRED_VERSION_gpe-icons ?= "0.25"
 
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
 PREFERRED_VERSION_gpe-su ?= "0.19"
 PREFERRED_VERSION_keylaunch ?= "2.0.10"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index d7209be624..b801536586 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1,7 +1,13 @@
-PREFERRED_VERSION_vte = "0.16.10"
-PREFERRED_VERSION_dbus = "1.1.1"
-PREFERRED_VERSION_gpsdrive = "2.10pre4"
 PREFERRED_VERSION_asterisk = "1.4.17"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.1.4"
 PREFERRED_VERSION_gnash = "0.8.1"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_libtool = "1.5.24"
 PREFERRED_VERSION_mono = "1.2.6"
 PREFERRED_VERSION_mono-mcs-intermediate = "1.2.6"
+PREFERRED_VERSION_mono-native = "1.2.6"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.10"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
index 324f4dd80c..0a95b1ff67 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
@@ -3,7 +3,7 @@
 QTE_VERSION ?= "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 
-OPIE_SRCDATE ?= "20070727"
+OPIE_SRCDATE ?= "20080127"
 OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}"
 OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}"
 
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
index 6db9d92f71..5a391aa45a 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
@@ -339,3 +339,9 @@ PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1"
 PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1"
 PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1"
 PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1"
+
+# Unreleased Packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
index 782549589d..c387161577 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
@@ -183,3 +183,9 @@ PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0"
 PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0"
+
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
index 59a481a104..dc34a99340 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
@@ -269,3 +269,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
 PREFERRED_VERSION_xserver-xorg ?= "1.2.0"
 
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
index d7e19284bc..648472e9b6 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
@@ -280,3 +280,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
 PREFERRED_VERSION_xserver-xorg ?= "1.4"
 
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
new file mode 100644
index 0000000000..4af2405aa7
--- /dev/null
+++ b/