merge of a2b72038a75fbaa0877614758b62b3787a0937a4

     and ade4046c4fc13b91526f334d6ca6f33972b6ff8c

88 files changed, 1774 insertions, 262 deletions

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 853abfd1b3..78b902f85d 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -1,7 +1,8 @@
 FILES_${PN} += '${libdir}/perl5'
+EXTRA_CPANFLAGS = ""
 
 cpan_do_configure () {
-	perl Makefile.PL
+	perl Makefile.PL ${EXTRA_CPANFLAGS}
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
 		. ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
 		sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index f509cd0a5d..fa3675fb59 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU  devices
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t iwmmxt armv5te ipaqpxa hx4700"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
 #use this for a hx47xx ipaq
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
@@ -37,10 +37,10 @@ include conf/machine/include/handheld-common.conf
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+#include conf/machine/include/tune-xscale.conf
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
+include conf/machine/include/tune-iwmmxt.conf
 
 
 # These modules are now compiled into the kernel:
diff --git a/packages/alsa/alsa-utils_1.0.11.bb b/packages/alsa/alsa-utils_1.0.11.bb
index 83bc8c5c86..10ebacee9b 100644
--- a/packages/alsa/alsa-utils_1.0.11.bb
+++ b/packages/alsa/alsa-utils_1.0.11.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
 
@@ -49,5 +49,6 @@ DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configura
 
 RDEPENDS_alsa-utils-aplay  += "alsa-conf"
 RDEPENDS_alsa-utils-amixer += "alsa-conf"
+RDEPENDS_alsa-utils-alsamixer += "alsa-conf"
 
 ALLOW_EMPTY_alsa-utils = "1"
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index 1d4e826814..2f1aa23ee8 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r14"
+PR = "r15"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -8,6 +8,7 @@ BOOTMODULES_RRECOMMENDS ?= ""
 DEBUG_APPS ?= ""
 DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace gdb procps",d)}'
 EXTRA_STUFF ?= ""
+PCMCIA_MANAGER ?= "pcmciautils"
 
 PACKAGES = "\
     angstrom-base-depends \
@@ -36,6 +37,7 @@ RDEPENDS_angstrom-base-depends = "\
     tslib-tests tslib-calibrate \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
+    ${PCMCIA_MANAGER} \	
 "
 
 RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware "
diff --git a/packages/autoconf/autoconf-2.59/sizeof_types.patch b/packages/autoconf/autoconf-2.59/sizeof_types.patch
index 0f1e0d1fee..30fd5c1926 100644
--- a/packages/autoconf/autoconf-2.59/sizeof_types.patch
+++ b/packages/autoconf/autoconf-2.59/sizeof_types.patch
@@ -3,15 +3,38 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
---- autoconf-2.59/lib/autoconf/types.m4~sizeof_types.patch	2003-05-22 08:05:14.000000000 -0400
-+++ autoconf-2.59/lib/autoconf/types.m4	2004-05-29 01:31:24.828295015 -0400
-@@ -380,32 +380,38 @@
+Index: autoconf-2.59/lib/autoconf/types.m4
+===================================================================
+--- autoconf-2.59.orig/lib/autoconf/types.m4	2003-05-22 14:05:14.000000000 +0200
++++ autoconf-2.59/lib/autoconf/types.m4	2006-08-06 02:05:02.000000000 +0200
+@@ -380,26 +380,66 @@
  # Generic checks.  #
  # ---------------- #
  
++# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
++# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
++# ------------------------------------------------------------------------
++# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
++AC_DEFUN([AC_CHECK_TARGET_TOOL],
++[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
++AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
++if test -z "$ac_cv_prog_$1"; then
++  if test "$build" = "$target"; then
++    ac_ct_$1=$$1
++    AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
++    $1=ac_ct_$1
++  else
++    $1="$3"
++  fi
++else
++  $1="$ac_cv_prog_$1"
++fi
++])# AC_CHECK_TARGET_TOOL
++
++
 +AC_DEFUN([AC_PROG_SIZE],
 +[
-+  AC_CHECK_TOOL(SIZE, size, :)
++  AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
 +])
  
  # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
@@ -35,14 +58,25 @@
 -		  [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
 +[
 +if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
-+		   [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
-+		   [
-+		     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
-+		   ],
-+		   [
-+		     AS_TR_SH([ac_cv_sizeof_$1])=0
-+		   ])
++	if test "$cross_compiling" = yes; then
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
++			   [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
++			   ],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=0
++			   ])
++	else
++		# The cast to unsigned long works around a bug in the HP C Compiler
++		# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++		# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++		# This bug is HP SR number 8606223364.
++		_AC_COMPUTE_INT([(long) (sizeof ($1))],
++			[AS_TR_SH([ac_cv_sizeof_$1])],
++			[AC_INCLUDES_DEFAULT([$3])],
++			[AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
++	fi
  else
    AS_TR_SH([ac_cv_sizeof_$1])=0
 -fi])dnl
@@ -51,9 +85,3 @@
  AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
  		   [The size of a `$1', as computed by sizeof.])
  ])# AC_CHECK_SIZEOF
- 
--
--
- # ---------------- #
- # Generic checks.  #
- # ---------------- #
diff --git a/packages/bootchart/files/.mtn2git_empty b/packages/bootchart/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bootchart/files/.mtn2git_empty
diff --git a/packages/bootchart/files/handheld.patch b/packages/bootchart/files/handheld.patch
new file mode 100644
index 0000000000..c3ded668bc
--- /dev/null
+++ b/packages/bootchart/files/handheld.patch
@@ -0,0 +1,105 @@
+diff -ur bootchart-0.9-org/script/bootchartd bootchart-0.9/script/bootchartd
+--- bootchart-0.9-org/script/bootchartd	2005-11-13 19:40:01.000000000 +0200
++++ bootchart-0.9/script/bootchartd	2006-08-03 19:06:22.000000000 +0300
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Bootchart logger script
+ # Ziga Mahkovec  <ziga.mahkovec@klika.si>
+@@ -43,10 +43,12 @@
+ 	# boot), a tmpfs is mounted in /mnt.  The mount point is immediately
+ 	# released using a lazy umount, so the script must never leave that
+ 	# directory.
+-	LOG_DIR="$( mktemp -d /tmp/bootchart.XXXXXX 2>/dev/null )"
++	#LOG_DIR="$( mktemp -d /tmp/bootchart.XXXXXX 2>/dev/null )"
++	LOG_DIR=""
+ 	if [ -z "$LOG_DIR" ]; then
+-		LOG_DIR="/mnt"
+-		LAZY_UMOUNT="yes"
++		LOG_DIR="/bootchart"
++		mkdir -p $LOG_DIR
++		#LAZY_UMOUNT="yes"
+ 		mount -n -t tmpfs -o size=$TMPFS_SIZE none "$LOG_DIR" >/dev/null 2>&1
+ 	fi
+ 	cd "$LOG_DIR"
+@@ -54,7 +56,7 @@
+ 	[ -n "$LAZY_UMOUNT" ] && umount -nfl "$LOG_DIR"
+ 
+ 	# Enable process accounting if configured
+-	if [ "$PROCESS_ACCOUNTING" = "yes" ]; then
++	if [ "$PROCESS_ACCOUNTING" = "yes" -a -x /usr/sbin/accton ]; then
+ 		> kernel_pacct
+ 		accton kernel_pacct
+ 	fi
+@@ -153,7 +155,7 @@
+ 
+ 	# Stop process accounting if configured
+ 	local pacct=
+-	if [ "$PROCESS_ACCOUNTING" = "yes" ]; then
++	if [ "$PROCESS_ACCOUNTING" = "yes" -a -x /usr/sbin/accton ]; then
+ 		accton
+ 		pacct=kernel_pacct
+ 	fi
+@@ -215,18 +217,34 @@
+ 	# Started by the kernel.  Start the logger in background and exec
+ 	# init(1).
+ 	IN_INIT="yes"
+-	echo "Starting bootchart logging"
+-	start &
+ 	
+ 	# Optionally, an alternative init(1) process may be specified using
+ 	# the kernel command line (e.g. "bootchart_init=/sbin/initng")
++	# Optionally, possible to override sample period using
++	# the kernel command line (e.g. "bootchart_sample_period=0.1")
+ 	init="/sbin/init"
+-	for i in $@; do
++
++	#kparams=$@
++	# For some reason, handheld kernel doesn't pass command line here - fish for it
++	mount -t proc none /bootchart
++	kparams=`cat /bootchart/cmdline`
++	umount /bootchart
++
++	echo "Kernel params: $kparams"
++	for i in $kparams; do
+ 		if [ "${i%%=*}" = "bootchart_init" ]; then
+ 			init="${i#*=}"
+ 			break
+ 		fi
++		if [ "${i%%=*}" = "bootchart_sample_period" ]; then
++			SAMPLE_PERIOD="${i#*=}"
++			break
++		fi
+ 	done
++
++	echo "Starting bootchart logging, sample period: ${SAMPLE_PERIOD}s"
++	start &
++
+ 	exec $init $*
+ fi
+ 
+diff -ur bootchart-0.9-org/script/bootchartd.conf bootchart-0.9/script/bootchartd.conf
+--- bootchart-0.9-org/script/bootchartd.conf	2005-11-13 19:40:01.000000000 +0200
++++ bootchart-0.9/script/bootchartd.conf	2006-08-03 15:21:31.000000000 +0300
+@@ -10,16 +10,17 @@
+ BOOTLOG_LOCK=".lock"
+ 
+ # Sampling period (in seconds)
+-SAMPLE_PERIOD=0.2
++# Default 0.2 is not fine enough to catch peculiarities in OE-based distro
++SAMPLE_PERIOD=0.1
+ 
+ # Whether to enable and store BSD process accounting information.  The
+ # kernel needs to be configured to enable v3 accounting
+ # (CONFIG_BSD_PROCESS_ACCT_V3). accton from the GNU accounting utilities
+ # is also required.
+-PROCESS_ACCOUNTING="no"
++PROCESS_ACCOUNTING="yes"
+ 
+ # Tarball for the various boot log files
+-BOOTLOG_DEST=/var/log/bootchart.tgz
++BOOTLOG_DEST=/bootchart.tgz
+ 
+ # Whether to automatically generate the boot chart once the boot logger
+ # completes.  The boot chart will be generated in $AUTO_RENDER_DIR.
diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb
index be1087d691..f246bf633b 100644
--- a/packages/freedroid/freedroid_1.0.2.bb
+++ b/packages/freedroid/freedroid_1.0.2.bb
@@ -21,5 +21,5 @@ do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 src/freedroid ${D}${bindir}
         install -d ${D}${datadir}/freedroid/
-	cp -a graphics map sound ${D}${datadir}/freedroid/
+	cp -pPR graphics map sound ${D}${datadir}/freedroid/
 }
diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb
index 35c0d0cbd6..532d9d083c 100644
--- a/packages/freetype/freetype_2.1.10.bb
+++ b/packages/freetype/freetype_2.1.10.bb
@@ -13,6 +13,7 @@ inherit autotools pkgconfig binconfig
 
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+EXTRA_OECONF = "--without-zlib"
 
 do_configure() {
 	cd builds/unix
diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb
index 5e9db480ea..49770277b9 100644
--- a/