merge of 6944b5095dc4e51204d347f835d2582dd53a3453

     and dce80cc984382186d77b2f734df55dc524fab331

87 files changed, 1078 insertions, 68205 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 4bf37dfd03..852727e707 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -777,6 +777,11 @@ ftp://ftp.gnupg.org/gcrypt/     http://gulus.USherbrooke.ca/pub/appl/GnuPG/
 ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN
 ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/
 ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/
+ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/
+ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/
+ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/
+ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
+ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/
 
 
 
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 5c1ed1296d..9c1208c690 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -52,7 +52,7 @@ PREFERRED_PROVIDER_libx11 = "diet-x11"
 
 #Make sure we use 2.6 on machines with a 2.4/2.6 selector
 KERNEL = "kernel26"
-ZKERNEL_VERSION = "2.6"
+MACHINE_KERNEL_VERSION = "2.6"
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf
index d9ace6d629..b26238e66e 100644
--- a/conf/distro/generic-uclibc.conf
+++ b/conf/distro/generic-uclibc.conf
@@ -19,6 +19,7 @@ DISTRO_NAME = "generic-uClibC"
 # Target OS and FPU system
 #
 TARGET_OS = "linux-uclibc"
-TARGET_FPU = "soft"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
 PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
 PREFERRED_PROVIDER_virtual/libintl = "libintl"
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index e6671d1337..594958600f 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -45,7 +45,8 @@ PREFERRED_VERSION_binutils = "2.15.94.0.1"
 # Target OS and FPU system
 # 
 TARGET_OS = "linux"
-TARGET_FPU = "soft"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 9f79c32118..89944023ad 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -25,7 +25,7 @@ DISTRO_TYPE = "debug"
 #            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
 #              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
 
-SRCDATE = "20060514"
+SRCDATE ?= "20060514"
 #
 # Zaurus
 #
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 4417b67862..9d23b654cf 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -88,9 +88,10 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # ENABLE_BINARY_LOCALE_GENERATION = "0"
 # ASSUME_PROVIDED += "qemu-native"
 
-# Uncomment this to select a particular kernel version if supported by 
-# your MACHINE setting. Currently only supported by poodle and tosa.
-# ZKERNEL_VERSION = "2.6"
+# Uncomment this to select a particular major kernel version if the MACHINE setting
+# supports more than one major kernel version. Currently this is suported by the
+# following MACHINE types: poodle, tosa and simpad.
+# MACHINE_KERNEL_VERSION = "2.6"
 
 # Uncomment one of these to build packages during the build process.
 # This is done automatically if you set DISTRO (see above)
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf
new file mode 100644
index 0000000000..b5fda186ca
--- /dev/null
+++ b/conf/machine/include/simpad-2.4.conf
@@ -0,0 +1,7 @@
+PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules orinoco-modules \
+orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf
new file mode 100644
index 0000000000..a5f4962c75
--- /dev/null
+++ b/conf/machine/include/simpad-2.6.conf
@@ -0,0 +1,4 @@
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools"
diff --git a/conf/machine/native.conf b/conf/machine/native.conf
index 92c3072c8c..d3c77bf9bd 100644
--- a/conf/machine/native.conf
+++ b/conf/machine/native.conf
@@ -7,7 +7,7 @@ TARGET_PREFIX = ""
 VENDOR = "-oe"
 
 PREFERRED_PROVIDER_virtual/kernel = "native-kernel"
-ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++"
+ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++ virtual/libc virtual/libintl virtual/libiconv"
 ASSUME_PROVIDED += "binutils-cross"
 ASSUME_PROVIDED += "virtual/libiconv virtual/libintl virtual/libc"
 
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 79915e4f74..49eaf1ef4b 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -5,8 +5,8 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-ZKERNEL_VERSION ?= "2.4"
-include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION ?= "2.4"
+include conf/machine/include/poodle-${MACHINE_KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
 
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 43097d871e..b227312589 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -2,24 +2,12 @@
 #@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD
 #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
 
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
-
-OVERRIDES =. "${KERNEL}:"
+MACHINE_KERNEL_VERSION ?= "2.4"
+require conf/include/simpad-${MACHINE_KERNEL_VERSION}.conf
 
 TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel24 = "opensimpad-64+0"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
-PREFERRED_PROVIDERS_kernel26 += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
-
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules_kernel24 = "0.13e"
-
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 += "udev module-init-tools"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 += "hostap-modules orinoco-modules \
-orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel"
 
 BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules-cs \
 kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
@@ -38,6 +26,6 @@ ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
 GPE_EXTRA_INSTALL += "suspend-desktop"
 
-include conf/machine/include/handheld-common.conf
-include conf/machine/include/tune-strongarm.conf
+require conf/machine/include/handheld-common.conf
+require conf/machine/include/tune-strongarm.conf
 
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 751b498f14..2652004f82 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,8 +5,8 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-ZKERNEL_VERSION ?= "2.4"
-include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION ?= "2.4"
+include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
diff --git a/packages/dbus/dbus-0.61/dbus-1.init b/packages/dbus/dbus-0.61/dbus-1.init
deleted file mode 100644
index 60440b7223..0000000000
--- a/packages/dbus/dbus-0.61/dbus-1.init
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# -*- coding: utf-8 -*-
-# Debian init.d script for D-BUS
-# Copyright © 2003 Colin Walters <walters@debian.org>
-
-set -e
-
-DAEMON=/usr/bin/dbus-daemon
-NAME=dbus-1
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
-DESC="system message bus"
-EVENTDIR=/etc/dbus-1/event.d
-
-test -x $DAEMON || exit 0
-
-# Source defaults file; edit that file to configure this script.
-ENABLED=1
-PARAMS=""
-if [ -e /etc/default/dbus-1 ]; then
-  . /etc/default/dbus-1
-fi
-
-test "$ENABLED" != "0" || exit 0
-
-start_it_up()
-{
-  if [ ! -d $PIDDIR ]; then
-    mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
-  fi
-  if [ -e $PIDFILE ]; then
-    PIDDIR=/proc/$(cat $PIDFILE)
-    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
-      echo "$DESC already started; not starting."
-    else
-      echo "Removing stale PID file $PIDFILE."
-      rm -f $PIDFILE
-    fi
-  fi
-  echo -n "Starting $DESC: "
-  start-stop-daemon --start --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  if [ -d $EVENTDIR ]; then
-      run-parts --arg=start $EVENTDIR
-  fi
-}
-
-shut_it_down()
-{
-  if [ -d $EVENTDIR ]; then
-      run-parts --reverse --arg=stop $EVENTDIR
-  fi
-  echo -n "Stopping $DESC: "
-  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER
-  # We no longer include these arguments so that start-stop-daemon
-  # can do its job even given that we may have been upgraded.
-  # We rely on the pidfile being sanely managed
-  # --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    start_it_up
-  ;;
-  stop)
-    shut_it_down
-  ;;
-  restart|force-reload)
-    shut_it_down
-    sleep 1
-    start_it_up
-  ;;
-  *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
-    exit 1
-  ;;
-esac
-
-exit 0
diff --git a/packages/dbus/dbus-0.61/no-bindings.patch b/packages/dbus/dbus-0.61/no-bindings.patch
deleted file mode 100644
index ccfc3f88b2..0000000000
--- a/packages/dbus/dbus-0.61/no-bindings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dbus-0.50/tools/Makefile.am.orig	2005-09-07 10:05:38 +0200
-+++ dbus-0.50/tools/Makefile.am	2005