merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'

     and '8dfee9b2427785432e4161eb7cc749155230e08e'

13 files changed, 319 insertions, 224 deletions

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 6e7adda029..6d3ad7bd6b 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe"
 DISTRO_NAME = "AmsDelta Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
-require conf/distro/ansgstrom-2007.1.conf
+require conf/distro/angstrom-2007.1.conf
 
 
 DISTRO_TYPE = "debug"
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
deleted file mode 100644
index d2e59f85a4..0000000000
--- a/conf/distro/angstrom-2007.1-oabi.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-require conf/distro/angstrom-2007.1.conf
-
-#this is a special version of angstrom for armv4 based machines that can't do EABI
-#see http://wiki.debian.org/ArmEabiPort for details on that
-
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-
-#only glibc based builds are supported ATM
-TARGET_OS = "linux"
-
-PACKAGE_ARCH = "arm-oabi"
-PACKAGE_EXTRA_ARCHS = "arm-oabi"
-
-PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh13"
-
-FEED_ARCH_collie       = "arm-oabi"
-FEED_ARCH_h3600        = "arm-oabi"
-FEED_ARCH_h3800        = "arm-oabi"
-FEED_ARCH_simpad       = "arm-oabi"
-
-
-
-
-
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 71303ab836..66cb1df12f 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,11 +8,14 @@
 
 #DISTRO_VERSION = "2007.4"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "43"
+DISTRO_REVISION = "46"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
 
+#Images built can have to modes:
+# 'debug': empty rootpassword, strace and gdb included
+# 'release' no root password, no strace and gdb by default
 DISTRO_TYPE ?= "debug"
 #DISTRO_TYPE = "release"
 
@@ -75,154 +78,129 @@ FEED_ARCH_progear	= "i686"
 
 FEED_ARCH_efika		= "ppc603e"
 
+#strongarm machines, no EABI
+
+FEED_ARCH_collie        = "arm-oabi"
+FEED_ARCH_h3600         = "arm-oabi"
+FEED_ARCH_h3800         = "arm-oabi"
+FEED_ARCH_simpad        = "arm-oabi"
+
+#Tweak packaging for strongarm machines since they can't use EABI
+
+PACKAGE_ARCH_collie     = "arm-oabi"
+PACKAGE_ARCH_h3600      = "arm-oabi"
+PACKAGE_ARCH_h3800      = "arm-oabi"
+PACKAGE_ARCH_simpad     = "arm-oabi"
+
+PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3600  = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3800  = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
+
 FEED_URIS += " \
 		no-arch##${ANGSTROM_URI}/unstable/feed/all \
 		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
 		perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
 		python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
 		debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
+		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
 		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
 #        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
 
-
-# We will lock down a SRCDATE when we go into release mode
-#SRCDATE = "20070303"
-
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
-PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.20-hh6"
-PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.20-hh6"
-PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6"
-PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13"
-PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6"
-PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6"
-
-PREFERRED_VERSION_file = "4.18"
-PREFERRED_VERSION_file_native = "4.18"
-
-PREFERRED_VERSION_perl-native = "5.8.8"
-PREFERRED_VERSION_perl = "5.8.8"
-
-CVS_TARBALL_STASH = "\
+#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
+CVS_TARBALL_STASH ?= "\
 		     http://www.angstrom-distribution.org/unstable/sources/ \
 		     http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
 		    "
 
-# GPE
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
-PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 
+# We will lock down a SRCDATE when we go into release mode
+#SRCDATE = "20070703"
 
-# we don't ship gtk-directfb by default
-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+"
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+PCMCIA_MANAGER = "pcmciautils"
 
-PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_freetype = "2.3.3"
-PREFERRED_VERSION_freetype-native = "2.2.1"
-PREFERRED_VERSION_cairo = "1.4.4"
-PREFERRED_VERSION_glib-2.0 = "2.12.12"
-PREFERRED_VERSION_pango = "1.16.4"
+#Preferred version for the kernel on various machines
+PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.16-hh9"
+PREFERRED_VERSION_linux-handhelds-2.6_h3900         ?= "2.6.20-hh6"
+PREFERRED_VERSION_linux-handhelds-2.6_h4000         ?= "2.6.20-hh6"
+PREFERRED_VERSION_linux-handhelds-2.6_h5000         ?= "2.6.20-hh6"
+PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal  ?= "2.6.19-hh13"
+PREFERRED_VERSION_linux-handhelds-2.6_hx4700        ?= "2.6.20-hh6"
+PREFERRED_VERSION_linux-handhelds-2.6_magician      ?= "2.6.20-hh6"
+
+# Needed for crappy ipaqs with broken hostap in the kernel
+PREFERRED_VERSION_hostap-modules                    ?= "0.4.7"
+PREFERRED_VERSION_hostap-utils                      ?= "0.4.7"
+
+PREFERRED_VERSION_file         = "4.18"
+PREFERRED_VERSION_file_native  = "4.18"
+
+PREFERRED_VERSION_fontconfig       = "2.4.1"
+PREFERRED_VERSION_freetype         = "2.3.3"
+PREFERRED_VERSION_freetype-native  = "2.2.1"
+PREFERRED_VERSION_cairo            = "1.4.8"
+PREFERRED_VERSION_glib-2.0         = "2.12.12"
+PREFERRED_VERSION_pango            = "1.16.4"
+PREFERRED_VERSION_atk              = "1.10.3"
+PREFERRED_VERSION_gtk+             = "2.10.12"
 
 # older gtk-webcore releases don't work on ARM/EABI
 # We need to switch to a fixed SRCDATE or release as soon as possible 
-PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}"
-PREFERRED_VERSION_osb-jscore  = "0.5.2+svn${SRCDATE}"
-PREFERRED_VERSION_osb-nrcit   = "0.5.2+svn${SRCDATE}"
-PREFERRED_VERSION_osb-nrcore  = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-browser      = "0.5.0+svn${SRCDATE}"
+PREFERRED_VERSION_osb-jscore       = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcit        = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcore       = "0.5.2+svn${SRCDATE}"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-
-require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
+PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
-#PREFERRED_VERSION_xserver-kdrive = "1.2.0"
-PREFERRED_VERSION_gtk+ = "2.10.12"
-PREFERRED_VERSION_libgnomeui = "2.16.1"
+PREFERRED_VERSION_xserver-kdrive    ?= "1.2.0"
+PREFERRED_VERSION_libxrandr         ?= "1.2.1"
+PREFERRED_VERSION_xrandr            ?= "1.2.0" 
+PREFERRED_VERSION_randrproto        ?= "1.2.1"
 
-PREFERRED_VERSION_prismstumbler = "0.7.3"
+PREFERRED_VERSION_libgnomeui         = "2.16.1"
+PREFERRED_VERSION_prismstumbler      = "0.7.3"
 
-#zap extra stuff taking place in $MACHINE.conf 
-GPE_EXTRA_INSTALL = ""
-
-
-# E
-require conf/distro/include/preferred-e-versions.inc
+#use EABI ready toolchain
+PREFERRED_VERSION_gcc               ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross         ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk     ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
 
-#Make sure we use 2.6 on machines with a 2.4/2.6 selector
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-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          ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils-cross    ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 
-# Virtuals:
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
+PREFERRED_VERSION_avr32-gcc               = "4.1.2"
+PREFERRED_VERSION_avr32-gcc-cross         = "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.0.2"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2"
 
-# Others:
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp = "ntp"
-PREFERRED_PROVIDER_hotplug = "udev"
-PREFERRED_PROVIDER_libxss = "libxss"
-
-#NPTL stuff
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-
-
-#shouldn't that be uclibc-initial????
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
-
-#use EABI toolchain
-PREFERRED_VERSION_gcc ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
-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-cross-sdk ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
 
+#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
+PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21"
 
+#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_uclibc ?= "0.9.29"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
+
+#there's is no avr32 patch for 0.9.29
+PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
+PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
 
 PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
@@ -239,29 +217,93 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 # Busybox <1.1.0 doesn't have EABI support
 PREFERRED_VERSION_busybox = "1.2.1"
 
-PCMCIA_MANAGER = "pcmciautils"
-
 PREFERRED_VERSION_dbus ?= "1.0.2"
 PREFERRED_VERSION_dbus-glib ?= "0.72"
 
-PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
-PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
-PREFERRED_VERSION_hostap-modules ?= "0.4.7"
-PREFERRED_VERSION_hostap-utils ?= "0.4.7"
-
 PREFERRED_VERSION_wpa-supplicant = "0.5.5"
 
+
+#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-e-versions.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+
+
+# Virtuals:
+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"
+
+#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc               = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc    = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc  = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc            = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc        = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc         = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc          = "glibc-intermediate"
+
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc    = "uclibc-initial"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc  = "uclibc-initial"
+
+# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
+PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
+PREFERRED_PROVIDER_hostap-modules_h2200             ?= "hostap-modules"
+PREFERRED_PROVIDER_hostap-modules_hx4700            ?= "hostap-modules"
+
+PREFERRED_PROVIDER_virtual/db           ?= "db"
+PREFERRED_PROVIDER_virtual/db-native    ?= "db-native"
+PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
+PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
+
+# Others:
+PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
+PREFERRED_PROVIDER_esound 		?= "pulseaudio"
+PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs            ?= "gnome-vfs"
+PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
+PREFERRED_PROVIDER_tslib                ?= "tslib"
+PREFERRED_PROVIDER_tslib-conf           ?= "tslib"
+PREFERRED_PROVIDER_libgpewidget         ?= "libgpewidget"
+PREFERRED_PROVIDER_ntp                  ?= "ntp"
+PREFERRED_PROVIDER_hotplug               = "udev"
+PREFERRED_PROVIDER_libxss                = "libxss"
+
+# we don't ship gtk-directfb by default
+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+"
+
+
+#Silence a warning during parsing
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+
+
+
 #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
 # c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad
 
 
 # add altboot to compatible models, will be replaced with angstrom-bootmanager
-#EXTRA_STUFF_append_c7x0 = "altboot"
-#EXTRA_STUFF_append_akita = "altboot"
-#EXTRA_STUFF_append_spitz = "altboot"
-#EXTRA_STUFF_append_poodle = "altboot"
-#EXTRA_STUFF_append_tosa = "altboot"
+#PREFERRED_VERSION_altboot = "1.0.8+1.0.9_pre1"
+#EXTRA_STUFF_append_c7x0          +=  "altboot"
+#EXTRA_STUFF_append_akita         += "altboot"
+#EXTRA_STUFF_append_poodle        += "altboot"
+#EXTRA_STUFF_append_tosa          += "altboot"
+EXTRA_STUFF_append_spitz         += "altboot"
 
 
 # do some task-base stuff here
@@ -291,4 +333,5 @@ DISTRO_EXTRA_RDEPENDS += "\
 DISTRO_EXTRA_RRECOMMENDS += " \
     kernel-module-vfat \
     kernel-module-ext2 \
+    kernel-module-af-packet \
     "
diff --git a/conf/distro/hentges-2.0.conf b/conf/distro/hentges-2.0.conf
new file mode 100644
index 0000000000..5f23949d2d
--- /dev/null
+++ b/conf/distro/hentges-2.0.conf
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: hentges-2.0.conf
+# Date: 20070521 (YMD)
+
+DESCRIPTION = "Distribution configuration for the Hentges ROM based on Angstrom"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net"
+LICENSE = "MIT"
+
+######################################################################################
+
+require conf/distro/angstrom-2007.1.conf
+
+######################################################################################
+
+require conf/machine/hentges-2.0_common.conf
+require conf/machine/hentges-2.0_${MACHINE}.conf
+
+######################################################################################
+
+DISTRO_VERSION = "1.9+WIP-${DATE}"
+DISTRO_REVISION = "1"
+
+DISTRO = "hentges-2.0"
+DISTRO_NAME = "Hentges"
+
+######################################################################################
+
+# Override FEED_URIS here
+
+######################################################################################
+
+HENTGES_PV = "${DISTRO_VERSION}"
+HENTGES_PR = "${DISTRO_REVISION}"
+
+######################################################################################
+
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 9b288e8e0b..fdc814c49c 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
 PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+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']]}"
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index febfea2e26..0f20e9c29d 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -7,7 +7,8 @@ PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 
-TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}"
+TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d)  in ['bfin']]}"
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 6605fff3e8..3d4be081fb 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -37,7 +37,7 @@ TARGET_FPU_armeb ?= "soft"
 TARGET_FPU_ixp4xx ?= "soft"
 
 #Name the generated images in a sane way
-IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROM_MODE}-${DISTRO_VERSION}-${MACHINE}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 # Angstrom *always* has some form of release config, so error out if someone thinks he knows better 
diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc
index 2bf3e616d7..843f8e18ba 100644
--- a/conf/distro/include/oplinux.inc
+++ b/conf/distro/include/oplinux.inc
@@ -1,9 +1,11 @@
-#
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 # extra checking for needed tools
 #
 
 # set minimal version of BitBake needed
-BB_MIN_VERSION = "1.6.3"
+BB_MIN_VERSION = "1.6.7"
+
 #OPLinux and OPLinux-uclibc source mirrors
 INHERIT += "oplinux-mirrors"
 
@@ -14,34 +16,25 @@ INHERIT += "multimachine"
 INHERIT += "sanity"
 
 
-#
+
 # Naming schemes
-#
-PARALLEL_INSTALL_MODULES = "1"
 INHERIT += "package_ipk debian"
+PARALLEL_INSTALL_MODULES = "1"
 
-#
-# Packaging and output format
-
-IMAGE_FSTYPES = "tar jffs2 ext2 cramfs squashfs squashfs-lzma cpio.gz"
 
+#
+# Maintainer email
+MAINTAINER = "Digital OPSiS Developers Team <oplinux-developers@digital-opsis.com>"
 
 
+#
+# Packaging and output format
+IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz"
 
 # Specifies a location to search for pre-generated tarballs when fetching
 # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
-#CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/source/current/"
+CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/current/"
 
-#INHERIT += "owmnr-mirrors"
-
-#Uncommend this is if you are using bitbake multithread and you have multiple cpu's or cores you are running on
-#BB_NUMBER_THREADS = "5"
-
-#Uncommend this if you hava icecc installed
-#INHERIT += "icecc"
-#PARALLEL_MAKE = "-j6"
-#ICECC_PATH = "/usr/bin/icecc"
-#ICECC_ENV_EXEC = "/home/stelios/icecc-create-env"
 
 #
 # Bootstrap & Init
@@ -51,12 +44,54 @@ PREFERRED_PROVIDER_task-bootstrap = "task-base"
 DISTRO_FEATURES = "nfs smbfs ext2 pcmcia usbgadget usbhost pci"
 
 
-OPLINUX_URI = "http://www.ifaistos.awmn/oplinux"
-OPLINUX-uCLIBC_URI = "http://www.ifaistos.awmn/oplinux-uclibc"
+#We need to set this to avoid problems when building for if host=target
+TARGET_VENDOR = "-oplinux"
+
+#URI for base feeds
+OPLINUX_URI = "http://www.digital-opsis.com/oplinux"
+OPLINUX-uCLIBC_URI = "http://www.digital-opsis.com/oplinux-uclibc"
 
 #Dir config
 IMAGE_ROOTFS = "${TMPDIR}/rootfs/${MACHINE}"
 
+#Set the name of the generated images
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${MACHINE}-${DATE}-${SVN_REV}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+
+
+
+
+
+#
+#feed definitions
+#i32 machines
+#i486 machines
+FEED_ARCH_x86           ="i486"
+FEED_ARCH_wrap          ="i486"
+
+#i586 machines
+FEED_ARCH_i586-generic  = "i586"
+FEED_ARCH_epia          = "i586"
+
+#i686 machines
+FEED_ARCH_i686-generic  = "i686"
+FEED_ARCH_guinness      = "i686"
+FEED_ARCH_progear       = "i686"
+
+
+#powerpc machines
+#ppc405
+FEED_ARCH_dht-walnut    = "ppc405"
+FEED_ARCH_magicbox      = "ppc405"
+FEED_ARCH_xilinx-ml403  = "ppc405"
+
+#ppc440e
+FEED_ARCH_sequoia       = "ppc440e"
+
+#ppc603e
+FEED_ARCH_efika         = "ppc603e"
+
+
 #
 #Preferred versions of packages we need
 #
@@ -65,4 +100,9 @@ PREFERRED_VERSION_u-boot ?= "1.1.4"
 # Latest linphone supports yeaphone
 PREFERRED_VERSION_linphone ?= "1.6.0"
 
+#
+#SSH daemon
+#
+DISTRO_SSH_DAEMON ?= "dropbear"
+
 
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
index 6990c98000..fc3a77502d 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
@@ -220,7 +220,7 @@ PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
 
-PREFERRED_VERSION_konqueror-embedded = "20060404"
+PREFERRED_VERSION_konqueror-embedded = "20070212"
 
 
 SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}"
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index 7278b62565..2c039dbcce 100644
--- a/conf/distro/mokoslug.conf
+++ b/conf/distro/mokoslug.conf
@@ -14,7 +14,8 @@ DISTRO_VERSION = "1.0-alpha"
 DISTRO_REVISION = "1"
 DISTRO_TYPE = "debug"
 
-MACHINE_TASK_PROVIDER = "task-base sysconf"
+MACHINE_TASK_PROVIDER = "task-boot dropbear"
+MACHINE_TASK_PROVIDER_append_nslu2 = " sysconf"
 
 # Even though the NSLU2 does not have built-in bluetooth,
 # we assume that a MokoSlug gateway has a bluetooth dongle.
diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf
index d3e6c0344d..03e56b0148 100644
--- a/conf/distro/oplinux.conf
+++ b/conf/distro/oplinux.conf
@@ -1,17 +1,20 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #-----------------------------------------------------------------------------
 #@TYPE: Distribution
-#@NAME: OPLinux uClibC
-#@DESCRIPTION: OPLinux uClibC Embedded Linux Distribution Configuration
+#@NAME: OPLinux
+#@DESCRIPTION: OPLinux Embedded Linux Distribution Configuration
 #
 #@COMMENT: This is a distribution for a number of embedded targets
 #@COMMENT: currently supported are
-#@COMMENT: generic x86
-#@COMMENT: wrap (x86)
-#@COMMENT: dht-walnut (ppc405)
+#@COMMENT: x86 wrap   (i486)
+#@COMMENT: i586-generic epia (i586)
+#@COMMENT: i686-generic  (i686)
+#@COMMENT: dht-walnut magicbox (ppc405)
+#@COMMENT: sequoia (ppc440)
 #@COMMENT: efika (ppc603)
-#@COMMENT: rb5xx (mips)
 #@COMMENT:
-#@COMMENT: for additional info please check www.digital-opsis.com
+#@COMMENT: for additional info please check www.digital-opsis.com/oplinux
 #-----------------------------------------------------------------------------
 
 require conf/distro/include/oplinux.inc
@@ -22,7 +25,7 @@ require conf/distro/include/sane-srcdates.inc
 # Header
 #
 DISTRO_NAME = "OPLinux"
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+DISTRO_VERSION ?= ".dev-snapshot-${SRCDATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 
@@ -31,23 +34,31 @@ DISTRO_TYPE = "debug"
 #
 TARGET_OS = "linux"
 
+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_dbus-glib = "dbus-glib"
 PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
-PREFERRED_PROVIDER_virtual/libiconv     ?= "libiconv"
-PREFERRED_PROVIDER_virtual/libintl      ?= "libintl"
 
 
-
-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"
+# glibc:
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
+PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 
 
-#EABI stuff
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-linux-libc-for-gcc ="glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-oplinux-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-oplinux-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-oplinux-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-oplinux-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-oplinux-linux-libc-for-gcc = "glibc-intermediate"
 
 
 
@@ -81,21 +92,14 @@ PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 PREFERRED_VERSION_linux-libc-headers_i486 ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers_i586 ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18"
-
 PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
 
-PREFERRED_VERSION_glibc ?= "2.5"
-PREFERRED_VERSION_glibc_efika ?= "2.5"
-
-PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.5"
-
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+PREFERRED_VERSION_glibc ?= "2.5"
 
 PCMCIA_MANAGER = "pcmciautils"
-
 PREFERRED_VERSION_dbus ?= "1.0.2"
 PREFERRED_VERSION_dbus-glib ?= "0.71"
 
@@ -114,25 +118,6 @@ DISTRO_EXTRA_RDEPENDS += "\
                          nano pciutils"
 
 
-
-
-FEED_ARCH ?= "${TARGET_ARCH}"
-
-#i486 machines          
-FEED_ARCH_x86		="i486"
-
-#i586 machines
-FEED_ARCH_epia          = "i586"
-
-#i686 machines
-FEED_ARCH_guinness      = "i686"
-FEED_ARCH_progear       = "i686"
-
-#powerpc machines
-FEED_ARCH_efika         = "ppc603e"
-FEED_ARCH_dht-walnut    = "ppc405"
-
-
 FEED_URIS += " \
                 no-arch##${OPLINUX_URI}/unstable/feed/all \
                 base##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/base \
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 980c158181..564a2d0cfb 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -14,3 +14,8 @@ ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux"
 
 require conf/distro/include/slugos.inc
+
+# glibc:
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
+PREFERRED_PROVIDER_virtual/libc ?= "glibc"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index aaf5c690a8..ad75fffe11 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -47,6 +47,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
 PREFERRED_PROVIDERS += " virtual/libc:glibc"
 
+PREFERRED_PROVIDER_libc6-unslung = "glibc"
+
 PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
 PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"