Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

24 files changed, 106 insertions, 49 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 742654e7c1..a6db6815ce 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -96,9 +96,11 @@ kernel_do_stage() {
 
 	mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR
 	cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/
-	# Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH/include/asm	
+	# Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm	
 	if [ -e arch/${ARCH}/include/asm/ ] ; then 
 		cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/
+		install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include
+		cp -fR arch/${ARCH}/include/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/include/	
 	fi
 	rm -f $ASMDIR ${STAGING_KERNEL_DIR}/include/asm
 	ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm
diff --git a/conf/checksums.ini b/conf/checksums.ini
index c735e690d7..1bda49ad39 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3502,6 +3502,10 @@ sha256=28be7102bde3bc9b39be2732b89da9fbab79b7ac3898075ed414a45258bb3026
 md5=cc768faa584f6c31cc1e0a959a3b8c0c
 sha256=46c0991b71d1991aa2f90d6816d9efb737fc9f9b99713174fcdf8d323727a11c
 
+[ftp://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_2.30.tar.gz]
+md5=7fdd5f8395162d8728d4b79e97b9819e
+sha256=d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f381401
+
 [ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-1.4.4.tar.gz]
 md5=053f18fd5d00873de365413cab17a666
 sha256=d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 7a7c29f121..96484d4d2c 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -231,7 +231,7 @@ PREFERRED_VERSION_dcopidl2cpp-native ?= "3.5.4"
 PREFERRED_VERSION_dcopidl-native ?= "3.5.4"
 PREFERRED_VERSION_dcron ?= "2.3.3"
 PREFERRED_VERSION_ddclient ?= "3.6.3"
-PREFERRED_VERSION_debianutils ?= "2.19"
+PREFERRED_VERSION_debianutils ?= "2.30"
 PREFERRED_VERSION_dejagnu ?= "1.4.4"
 PREFERRED_VERSION_dejagnu-native ?= "1.4.4"
 PREFERRED_VERSION_detect-stylus ?= "0.13"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 41990a7ab1..a5537876c3 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -198,7 +198,7 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "2b78a9413619902aa4ff55a986b12ece3021fbe3"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-vala-terminal ?= "e5399ff1b88f5a16d6943e5dce6ab3679238cbc0"
+SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5"
 SRCREV_pn-webkit-gtk ?= "36540"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index d71d57b3bd..653d0b941f 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -173,7 +173,8 @@ do
 		      nmap \
 		      nmm \
 		      notecase \
-		      openmoko-browser2 \
+		      numptyphysics \
+	          openmoko-browser2 \
 		      openredalert \
 		      openvpn \
 		      opie-notes \
diff --git a/packages/debianutils/debianutils_2.30.bb b/packages/debianutils/debianutils_2.30.bb
new file mode 100644
index 0000000000..30beb5d4ed
--- /dev/null
+++ b/packages/debianutils/debianutils_2.30.bb
@@ -0,0 +1,5 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require debianutils.inc
+PR="r0"
diff --git a/packages/dsplink/lpm.inc b/packages/dsplink/lpm.inc
index 211ffd3766..7938268c52 100644
--- a/packages/dsplink/lpm.inc
+++ b/packages/dsplink/lpm.inc
@@ -3,8 +3,6 @@ DESCRIPTION = "Codec Engine for TI ARM/DSP processors - power module"
 DEPENDS = "virtual/kernel perl-native dsplink"
 RDEPENDS = "update-modules"
 
-inherit module
-
 require ti-paths.inc
 
 PARALLEL_MAKE = ""
@@ -13,22 +11,17 @@ do_compile_append() {
 	echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make		
 	echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make
 	echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}"  >> ${S}/Rules.make
+	export DSPLINK=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink
 
 	# Build the DSP power manager kernel module
-	cd ${S}/cetools/packages/ti/bios/power
-
-	# Unpack all kernel sources for the DSP power manager module
-	for dsp in $(ls | grep bld | awk -F, '{print $2}' | awk -F_ '{print $1}') ; do
-		if ! [ -e $dsp ] ; then tar xf ti_bios_power,${dsp}_bld.tar ; fi
-	done		
-	
-	cd ${DSPPOWERSOC}/lpm
-
-	unset LDFLAGS CFLAGS	
-	make   KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-           KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-           KERNEL_DIR=${STAGING_KERNEL_DIR}   \
-           KERNEL_VERSION=${KERNEL_VERSION}    \
+	cd ${S}/cetools/packages/ti/bios/power/modules/${DSPPOWERSOC}/lpm
+
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	rm -f *o
+	make   KERNEL_PATH=${STAGING_KERNEL_DIR} \
+           KERNEL_SRC=${STAGING_KERNEL_DIR} \
+           KERNEL_DIR=${STAGING_KERNEL_DIR} \
+           KERNEL_VERSION=${KERNEL_VERSION} \
            TOOL_PREFIX=${TARGET_PREFIX} \
            DSPLINK_REPO=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ \
            CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
diff --git a/packages/dsplink/ti-cmemk-module_2.21.bb b/packages/dsplink/ti-cmemk-module_2.21.bb
index 0e9f733c8b..d15accb3ae 100644
--- a/packages/dsplink/ti-cmemk-module_2.21.bb
+++ b/packages/dsplink/ti-cmemk-module_2.21.bb
@@ -6,10 +6,16 @@ PV = "221"
 # md5sum
 # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html
 
+inherit module
+
 SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \
            file://Makefile.dsplink \
 "
 
 S = "${WORKDIR}/codec_engine_2_21"
 
+do_compile() {
+	:
+}
+
 require cmemk.inc
diff --git a/packages/dsplink/ti-lpm-module_2.21.bb b/packages/dsplink/ti-lpm-module_2.21.bb
index 9a9791894d..6a6945f710 100644
--- a/packages/dsplink/ti-lpm-module_2.21.bb
+++ b/packages/dsplink/ti-lpm-module_2.21.bb
@@ -9,7 +9,12 @@ PV = "221"
 SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \
            file://Makefile.dsplink \
           "
+inherit module
 
 S = "${WORKDIR}/codec_engine_2_21"
 
+do_compile() {
+	:
+}
+
 require lpm.inc
diff --git a/packages/dsplink/ti-paths.inc b/packages/dsplink/ti-paths.inc
index 4599c3ef73..7640d6b4fe 100644
--- a/packages/dsplink/ti-paths.inc
+++ b/packages/dsplink/ti-paths.inc
@@ -1,10 +1,15 @@
+# To build the DSP applications you need to have DSP/BIOS, xdctools and codegen installed. Get these from:
+# https://www-a.ti.com/downloads/sds_support/targetcontent/bios/bios_5_33/sabios-j05/bios_setuplinux_5_33_02.bin
+# https://www-a.ti.com/downloads/sds_support/targetcontent/rtsc/xdctools_3_10_03/exports/xdctools_setuplinux_3_10_03.bin
+# <url for codegen>
+
 # Path to the dir where the TI tools are unpacked
 TITOOLSDIR ?= "/OE/TI"
 # Path under TITOOLSDIR where dspbios is unpacked
-TIBIOSDIR ?= "bios_5_32_04"
-TIXDCTOOLSDIR ?= "${TITOOLSDIR}/xdctools_3_10_02"
+TIBIOSDIR ?= "bios_5_33_02"
+TIXDCTOOLSDIR ?= "${TITOOLSDIR}/xdctools_3_10_03"
 # Path under TITOOLSDIR where the dsp toolchain is unpacked
-TICGTOOLSDIR ?= "cg6x_6_0_19"
+TICGTOOLSDIR ?= "cg6x_6_0_16"
 
 DSPLINKPLATFORM ?= "DAVINCI"
 DSPLINKPLATFORM_omap5912osk = "OMAP"
diff --git a/packages/images/fso-illume-image.bb b/packages/images/fso-illume-image.bb
index 979adf1855..a2bdda5e47 100644
--- a/packages/images/fso-illume-image.bb
+++ b/packages/images/fso-illume-image.bb
@@ -40,7 +40,7 @@ AUDIO_INSTALL = "\
   alsa-utils-amixer \
   gst-meta-audio \
   gst-plugin-modplug \
-  gst-plugin-sid \
+  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-sid', d)} \
   fso-sounds \
 "
 
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/gcc4x-limits.patch b/packages/linux/linux-handhelds-2.6-2.6.21/gcc4x-limits.patch
new file mode 100644
index 0000000000..02f3a5da09
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/gcc4x-limits.patch
@@ -0,0 +1,10 @@
+--- linux/scripts/mod/sumversion.c.orig	2008-11-15 12:22:04.000000000 +0000
++++ linux/scripts/mod/sumversion.c	2008-11-15 12:22:21.000000000 +0000
+@@ -7,6 +7,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <string.h>
++#include <linux/limits.h>
+ #include "modpost.h"
+ 
+ /*
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index 3df1102761..7fbc286774 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r20"
+PR = "r21"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -12,6 +12,7 @@ FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAM
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch;patch=1 \
            http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;patch=1 \
+           file://gcc4x-limits.patch;patch=1 \
 	   file://defconfig"
 
 require linux-handhelds-2.6.inc
diff --git a/packages/madplay/madplay_0.15.2b.bb b/packages/madplay/madplay_0.15.2b.bb
index d942b965e2..9c5bc5a742 100644
--- a/packages/madplay/madplay_0.15.2b.bb
+++ b/packages/madplay/madplay_0.15.2b.bb
@@ -8,5 +8,6 @@ HOMEPAGE = "http://www.mars.org/home/rob/proj/mpeg/"
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/${PN}-${PV}.tar.gz"
 
 inherit autotools
+ARM_INSTRUCTION_SET = "arm"
 
 FILES_${PN} = "${bindir}/madplay"
diff --git a/packages/mono/mono_1.2.6.inc b/packages/mono/mono_1.2.6.inc
index c9644cbce5..36eece0148 100644
--- a/packages/mono/mono_1.2.6.inc
+++ b/packages/mono/mono_1.2.6.inc
@@ -8,6 +8,7 @@ SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2 \
 S = "${WORKDIR}/mono-1.2.6"
 
 inherit autotools
+ARM_INSTRUCTION_SET = "arm"
 EXTRA_OECONF_arm = "--without-tls"
 EXTRA_OECONF_mipsel = "--without-tls"
 
diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index 0684214fc6..419398de95 100644
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -2,6 +2,7 @@ DESCRIPTION ?= "Browser made by mozilla"
 SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop"
 
 PARALLEL_MAKE = ""
+ARM_INSTRUCTION_SET = "arm"
 
 MOZPV ?= "${PV}"
 
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index cf899861a0..d1682435cb 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb
@@ -37,9 +37,11 @@ SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
 PACKAGE_ARCH_mplayer_collie = "collie"
 PACKAGE_ARCH_mencoder_collie = "collie"
 
+ARM_INSTRUCTION_SET = "ARM"
+
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-PR = "r17"
+PR = "r18"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb
index 8ecb205457..9d32fce12f 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb
@@ -40,10 +40,12 @@ PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_c7x0 = "c7x0"
 PACKAGE_ARCH_hx4700 = "hx4700"
 
+ARM_INSTRUCTION_SET = "ARM"
+
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
-PR = "r9"
+PR = "r10"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 26170c6ede..b0f12504d4 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -36,11 +36,13 @@ PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_c7x0 = "c7x0"
 PACKAGE_ARCH_hx4700 = "hx4700"
 
+ARM_INSTRUCTION_SET = "ARM"
+
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc2+svnr${SRCREV}"
-PR = "r6"
+PR = "r7"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv7a = "1"
 
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 921f4d7edd..921077b40b 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r45"
+PR = "r46"
 
 inherit task
 
@@ -104,4 +104,14 @@ RDEPENDS_task-openmoko-feed = "\
   midori \
   microcom \
   emacs \
+# for werner \
+  net-tools \
+  iproute2 \
+  iputils \
+  psmisc \
+  tar \
+  coreutils \
+  debianutils \
+  tcptraceroute \
+# dnsutils/bind-tools for dig, nslookup is still missing \
 "
diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
index 6e1cd5d895..ce512535dc 100644
--- a/packages/tasks/task-proper-tools.bb
+++ b/packages/tasks/task-proper-tools.bb
@@ -1,25 +1,30 @@
 DESCRIPTION = "Full versions of tools provided by busybox"
-PR = "r6"
+PR = "r7"
 
 inherit task
 
 RDEPENDS_${PN} = "\
-            coreutils \
-	    findutils \
-	    util-linux-ng \
-	    gawk \
-	    sed \
-	    wget \
-	    patch \
-            tar \
-	    diffutils \
-            less \
-            vim \
-	    e2fsprogs \
-            binutils-symlinks \
-            module-init-tools \
+		coreutils \
+		findutils \
+		util-linux-ng \
+		gawk \
+		sed \
+		wget \
+		patch \
+		tar \
+		diffutils \
+		less \
+		vim \
+		e2fsprogs \
+		binutils-symlinks \
+		module-init-tools \
+		net-tools \
+		iproute2 \
+		iputils \
+		psmisc \
+		debianutils \
+		tcptraceroute \
 	    "
-
 #
 # binutils-symlinks provide ar in a way which conflict with busybox - #1465 for more info
 #
diff --git a/packages/telepathy/empathy_2.24.0.bb b/packages/telepathy/empathy_2.24.0.bb
index 66c8210adf..b9cf1d5ac9 100644
--- a/packages/telepathy/empathy_2.24.0.bb
+++ b/packages/telepathy/empathy_2.24.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Empathy: a Telepathy based IM client"
 HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
 LICENSE = "GPL"
-DEPENDS = "python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
+DEPENDS = "gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
 RDEPENDS = "telepathy-mission-control"
 RRECOMMENDS = "telepathy-gabble"
 
diff --git a/packages/u-boot/u-boot-omap3_git.bb b/packages/u-boot/u-boot-omap3_git.bb
index 5be3657fba..56ca67bb60 100644
--- a/packages/u-boot/u-boot-omap3_git.bb
+++ b/packages/u-boot/u-boot-omap3_git.bb
@@ -2,10 +2,10 @@ require u-boot.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${MACHINE}"
 
-SRCREV = "c492706ba046124333323273f6fc21123360cb50"
+SRCREV = "08d7fdcce5dde5c2dc968fac5b2facf17cbabb5"
 
-PV = "2008.10-rc1+${PR}+git${SRCREV}"
-PR ="r1"
+PV = "2008.10+${PR}+git${SRCREV}"
+PR ="r2"
 
 SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \
           "
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 92df2d0f94..3abf37a409 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -27,6 +27,7 @@ S = "${WORKDIR}/"
 
 inherit autotools pkgconfig lib_package
 
+ARM_INSTRUCTION_SET = "arm"
 # FIXME: Segfaulting without --with-http-backend=curl
 EXTRA_OECONF = "\
                 --enable-debug=no \