merge of c07983d563d6bb267abbabb4971b40387f9e16f4

     and df0016306331c3dc82088b0c31109e7841171b48

60 files changed, 1494 insertions, 76909 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 5f0e0d2fce..683b9e0d2a 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -475,6 +475,34 @@ python base_do_patch() {
 		else:
 			pname = os.path.basename(unpacked)
 
+		if "mindate" in parm:
+			mindate = parm["mindate"]
+		else:
+			mindate = 0
+
+		if "maxdate" in parm:
+			maxdate = parm["maxdate"]
+		else:
+			maxdate = bb.data.getVar('DATE', d, 1)
+
+		pn = bb.data.getVar('PN', d, 1)
+		srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+
+		if not srcdate:
+			srcdate = bb.data.getVar('SRCDATE', d, 1)
+
+		if srcdate == "now": 
+			srcdate = bb.data.getVar('DATE', d, 1)
+
+		if (maxdate < srcdate) or (mindate > srcdate):
+			if (maxdate < srcdate):
+				bb.note("Patch '%s' is outdated" % pname)
+
+			if (mindate > srcdate):
+				bb.note("Patch '%s' is predated" % pname)
+
+			continue
+
 		bb.note("Applying patch '%s'" % pname)
 		bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
 		bb.data.setVarFlag("do_patchcmd", "func", 1, d)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 54815cd0a0..3542cfbdee 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -382,9 +382,9 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
 #
 # This works for  functions as well, they are really just environment variables.
-OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
+#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
 # Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
-#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
+OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
 
 ##################################################################
 # Include the rest of the config files.
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
new file mode 100644
index 0000000000..de4b6e34c2
--- /dev/null
+++ b/conf/distro/amsdelta-oe.conf
@@ -0,0 +1,59 @@
+DISTRO = "amsdelta-oe"
+DISTRO_NAME = "AmsDelta Linux"
+DISTRO_VERSION = "unstable-${DATE}"
+
+include conf/distro/familiar.conf
+
+
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
+
+
+FEED_URIS += " \
+        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
+        updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
+
+#SRCDATE = 20050331
+#SRCDATE = "now"
+
+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/libiconv=glibc
+PREFERRED_PROVIDER_virtual/libintl=glibc
+
+# The CSL compiler is unusable because
+# 1) certain programs stop to compile
+# 2) more programs segfault
+PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+
+#
+# PIN the familiar build to a version
+#
+PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
+PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
+
+#
+# Opie
+#
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
+
+OPIE_VERSION = "1.2.1"
+include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
+
+include conf/distro/preferred-gpe-versions-2.8.inc
+
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 1e77bdae92..9f79c32118 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -6,6 +6,11 @@
 
 DISTRO_VERSION = ".dev-snapshot-${DATE}"
 
+CVS_TARBALL_STASH = "\
+http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
+http://www.oesources.org/source/current/"
+
+
 include conf/distro/openzaurus.conf
 
 DISTRO_TYPE = "debug"
diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf
new file mode 100644
index 0000000000..dbe74dea45
--- /dev/null
+++ b/conf/machine/amsdelta.conf
@@ -0,0 +1,27 @@
+#@TYPE: Machine
+#@NAME: OMAP5910 cpu on an Amstrad E3
+#@DESCRIPTION: Machine configuration for the Amstrad E3
+
+TARGET_ARCH = "arm"
+
+TARGET_FPU = "soft"
+IPKG_ARCHS = "all arm ${MACHINE}"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-amsdelta-2.6"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+
+EXTRA_IMAGEDEPENDS += "u-boot linux-amsdelta-2.6"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral mtd-utils udev"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+GUI_MACHINE_CLASS="smallscreen"
+
+PREFERRED_VERSION_u-boot = 1.1.4
+
+TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
+
+IMAGE_FSTYPES = "ext2.gz tar.bz2"
diff --git a/packages/linux/linux-ezx/old/.mtn2git_empty b/packages/base-files/base-files/amsdelta/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-ezx/old/.mtn2git_empty
+++ b/packages/base-files/base-files/amsdelta/.mtn2git_empty
diff --git a/packages/base-files/base-files/amsdelta/fstab b/packages/base-files/base-files/amsdelta/fstab
new file mode 100644
index 0000000000..bf87f5f11b
--- /dev/null
+++ b/packages/base-files/base-files/amsdelta/fstab
@@ -0,0 +1,6 @@
+/dev/mtdblock4	/ 	jffs2	defaults	1  1 
+proc            /proc   proc    defaults        0  0
+tmpfs		/var	tmpfs	defaults	0  0
+
+# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
+tmpfs		/media/ram	tmpfs	defaults	0  0
diff --git a/packages/directfb/++dfb_0.9.23.bb b/packages/directfb/++dfb_0.9.23.bb
index 4574b8eb4c..4c1f6bc482 100644
--- a/packages/directfb/++dfb_0.9.23.bb
+++ b/packages/directfb/++dfb_0.9.23.bb
@@ -1,30 +1,19 @@
 DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library."
 HOMEPAGE = "http://directfb.org"
 SECTION = "libs"
-PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "directfb"
 LICENSE = "LGPL"
 
-# needs a g++4 patch
-BROKEN = "1"
-
 SRC_URI = "http://www.directfb.org/downloads/Extras/++DFB-${PV}.tar.gz"
 S = "${WORKDIR}/++DFB-${PV}"
 
 inherit autotools pkgconfig
 
 do_stage() {
-        oe_runmake -C include 'libdir=/lib' 'includedir=/include/dfb++' \
-                          'oldincludedir=/include' 'datadir=/share' \
-                          'DESTDIR=${STAGING_LIBDIR}/..' \
-                          install-dfbppincludeHEADERS
-        oe_runmake -C dfb++ 'libdir=/lib' 'includedir=/include/dfb++' \
-                          'oldincludedir=/include' 'datadir=/share' \
-              'DESTDIR=${STAGING_LIBDIR}/..' \
-              install-libLTLIBRARIES
+	autotools_stage_all
 }
 
-
 do_install() {
         oe_runmake 'DESTDIR=${D}' install
 }
diff --git a/packages/directfb/dfb++_0.9.23.bb b/packages/directfb/dfb++_0.9.23.bb
deleted file mode 100644
index 0e0772da94..0000000000
--- a/packages/directfb/dfb++_0.9.23.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library."
-HOMEPAGE = "http://directfb.org"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "directfb"
-LICENSE = "LGPL"
-
-# needs a g++4 patch
-BROKEN = "1"
-
-SRC_URI = "http://www.directfb.org/downloads/Extras/DFB++-${PV}.tar.gz"
-S = "${WORKDIR}/DFB++-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
-        oe_runmake -C include 'libdir=/lib' 'includedir=/include/dfb++' \
-                          'oldincludedir=/include' 'datadir=/share' \
-                          'DESTDIR=${STAGING_LIBDIR}/..' \
-                          install-dfbppincludeHEADERS
-        oe_runmake -C dfb++ 'libdir=/lib' 'includedir=/include/dfb++' \
-                          'oldincludedir=/include' 'datadir=/share' \
-              'DESTDIR=${STAGING_LIBDIR}/..' \
-              install-libLTLIBRARIES
-}
-
-
-do_install() {
-        oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/packages/directfb/directfb-examples_0.9.23.bb b/packages/directfb/directfb-examples_0.9.23.bb
index 423e888fd8..5357b55b6d 100644
--- a/packages/directfb/directfb-examples_0.9.23.bb
+++ b/packages/directfb/directfb-examples_0.9.23.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "DirectFB examples"
 DEPENDS = "directfb"
 SECTION = "devel/examples"
 LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de"
 
 SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz"
 S = "${WORKDIR}/DirectFB-examples-${PV}"
diff --git a/packages/directfb/directfb_0.9.25.1.bb b/packages/directfb/directfb_0.9.25.1.bb
index 9d5566405a..76e849d14b 100644
--- a/packages/directfb/directfb_0.9.25.1.bb
+++ b/packages/directfb/directfb_0.9.25.1.bb
@@ -5,14 +5,14 @@ translucent windows and multiple display layers on top of the \
 Linux framebuffer device."
 SECTION = "libs"
 LICENSE = "LGPL"
-PRIORITY = "optional"
 HOMEPAGE = "http://directfb.org"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "jpeg libpng freetype zlib"
 PR = "r1"
 RV = "0.9.25"
 
-SRC_URI = "http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz"
+SRC_URI = "http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
+           file://fix-pkgconfig-specs.patch;patch=1"
 S = "${WORKDIR}/DirectFB-${PV}"
 
 inherit autotools pkgconfig
@@ -31,5 +31,5 @@ do_install() {
 FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
                           ${libdir}/directfb-${RV}/inputdrivers/*.so \
                           ${libdir}/directfb-${RV}/interfaces/*/*.so \
-			  ${libdir}/directfb-${RV}/wm/*.so \
+                          ${libdir}/directfb-${RV}/wm/*.so \
                           ${datadir}/directfb-${RV}"
diff --git a/packages/directfb/files/.mtn2git_empty b/packages/directfb/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/directfb/files/.mtn2git_empty
diff --git a/packages/directfb/files/fix-pkgconfig-specs.patch b/packages/directfb/files/fix-pkgconfig-specs.patch
new file mode 100644
index 0000000000..401d7fa443
--- /dev/null
+++ b/packages/directfb/files/fix-pkgconfig-specs.patch
@@ -0,0 +1,13 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- DirectFB-0.9.25.1/directfb.pc.in~fix-pkgconfig-specs	2005-10-19 01:14:04.000000000 +0200
++++ DirectFB-0.9.25.1/directfb.pc.in	2006-05-20 01:02:37.000000000 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: fusion direct
+ Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
+-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb
diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb
index b3bbe54b02..56ffea86dd 100644
--- a/packages/expat/expat_2.0.0.bb
+++ b/packages/expat/expat_2.0.0.bb
@@ -1,8 +1,8 @@
-SECTION = "libs"
 DESCRIPTION = "Jim Clarkes XML parser library."
 HOMEPAGE = "http://expat.sourceforge.net/"
+SECTION = "libs"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
 	   file://autotools.patch;patch=1"
@@ -11,18 +11,19 @@ S = "${WORKDIR}/expat-${PV}"
 inherit autotools lib_package
 export LTCC = "${CC}"
 
-do_configure () {
+do_configure() {
 	rm -f ${S}/conftools/libtool.m4
+	touch ${S}/conftools/libtool.m4
 	autotools_do_configure
 }
 
-do_stage () {
+do_stage() {
 	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
 	install -m 0644 ${S}/lib/expat_external.h ${STAGING_INCDIR}/
 	oe_libinstall -so libexpat ${STAGING_LIBDIR}
 }
 
-do_install () {
+do_install() {
 	oe_runmake prefix="${D}${prefix}" \
 		bindir="${D}${bindir}" \
 		libdir="${D}${libdir}" \
diff --git a/packages/ezx/ezx-gpiotool_svn.bb b/packages/ezx/ezx-gpiotool_svn.bb
new file mode 100644
index 0000000000..e483c4091c
--- /dev/null
+++ b/packages/ezx/ezx-gpiotool_svn.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Gpiotool can read/write gpio configuration as well as individual gpio pins from userspace."
+SECTION = "devel"
+LICENSE = "GPL"
+HOMEPAGE = "http://openezx.org"
+AUTHOR = "Harald Welte"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src;module=gpiotool;proto=http"
+S = "${WORKDIR}/gpiotool"
+
+do_compile() {
+	for i in mmio.c gpiotool.c gpio.c
+	do
+		${CC} ${CFLAGS} -c $i
+	done
+	${CC} ${CFLAGS} -o ezx-gpiotool mmio.o gpiotool.o gpio.o
+}
+
+do_stage() {
+	:
+}
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -m 0755 ezx-gpiotool ${D}${sbindir}
+}
diff --git a/packages/gpe-mixer/gpe-mixer/.mtn2git_empty b/packages/gpe-mixer/gpe-mixer/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-mixer/gpe-mixer/.mtn2git_empty
diff --git a/packages/gpe-mixer/gpe-mixer/gpemixer-no-host-includes.patch b/packages/gpe-mixer/gpe-mixer/gpemixer-no-host-includes.patch
new file mode 100644
index 0000000000..888c42f3e2
--- /dev/null
+++ b/packages/gpe-mixer/gpe-mixer/gpemixer-no-host-includes.patch
@@ -0,0 +1,10 @@
+--- /tmp/Makefile	2006-05-20 15:44:18.249491416 +0200
++++ gpe-mixer-0.42/Makefile	2006-05-20 15:44:38.710380888 +0200
+@@ -22,7 +22,6 @@
+ PACKAGE_LDFLAGS += -L../libgpewidget
+ BUILD = ../build
+ else
+-PACKAGE_CFLAGS += -I/usr/include/gpe
+ BUILD = build
+ endif
+ PACKAGE_LDFLAGS += $(GPELIBS) $(GTKLIBS)
diff --git a/packages/gpe-mixer/gpe-mixer_0.42.bb b/packages/gpe-mixer/gpe-mixer_0.42.bb
index 3d3ef98917..5fe0e98c82 100644
--- a/packages/gpe-mixer/gpe-mixer_0.42.bb
+++ b/packages/gpe-mixer/gpe-mixer_0.42.bb
@@ -1,8 +1,10 @@
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 inherit gpe pkgconfig
 
+SRC_URI += "file://gpemixer-no-host-includes.patch;patch=1"
+
 DESCRIPTION = "GPE audio mixer"
 DEPENDS = "gtk+ libgpewidget"
 SECTION = "gpe"
diff --git a/packages/gpe-plucker/gpe-plucker/plucker-no-host-includes.patch b/packages/gpe-plucker/gpe-plucker/plucker-no-host-includes.patch
new file mode 100644
index 0000000000..2e2423b829
--- /dev/null
+++ b/packages/gpe-plucker/gpe-plucker/plucker-no-host-includes.patch
@@ -0,0 +1,10 @@
+--- /tmp/Makefile	2006-05-20 14:04:09.557951376 +0200
++++ gpe-plucker-0.4/Makefile	2006-05-20 14:04:35.687979008 +0200
+@@ -26,7 +26,6 @@
+ PACKAGE_LDFLAGS += -L../libgpewidget
+ BUILD = ../build
+ else
+-PACKAGE_CFLAGS += -I/usr/include/gpe
+ BUILD = build
+ endif
+ PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Lunpluck/ -lunpluck -lz
diff --git a/packages/gpe-plucker/gpe-plucker_0.4.bb b/packages/gpe-plucker/gpe-plucker_0.4.bb
index 18f7b92c02..238b1c13d6 100644
--- a/packages/gpe-plucker/gpe-plucker_0.4.bb
+++ b/packages/gpe-plucker/gpe-plucker_0.4.bb
@@ -5,6 +5,8 @@ DEPENDS = "gtk+ libgpewidget"
 SECTION = "gpe"
 PRIORITY = "optional"
 
+SRC_URI += " file://plucker-no-host-includes.patch;patch=1"
 PARALLEL_MAKE=""
 
+PR = "r1"
 
diff --git a/packages/libfribidi/libfribidi_0.10.4.bb b/packages/libfribidi/libfribidi_0.10.4.bb
index 7c2b70d7cc..57aaf48bed 100644
--- a/packages/libfribidi/libfribidi_0.10.4.bb
+++ b/packages/libfribidi/libfribidi_0.10.4.bb
@@ -8,7 +8,7 @@ PR = "r0"
 
 S = "${WORKDIR}/fribidi-${PV}"
 
-SRC_URI = "http://download.sourceforge.net/fribidi/fribidi-${PV}.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/fribidi/fribidi-${PV}.tar.bz2 \
            file://libtool-update.patch;patch=1"
 
 #PACKAGES += " ${PN}-bin"
diff --git a/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty
diff --git a/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/defconfig b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/defconfig
new file mode 100644
index 0000000000..175cd6d8da
--- /dev/null
+++ b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/defconfig
@@ -0,0 +1,1210 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.16-omap2
+# Sat Apr  8 14:54:06 2006
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_FIQ=y
+
+#
+# Code maturity level options
+#