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

70 files changed, 38370 insertions, 8203 deletions

diff --git a/packages/busybox/busybox-1.11.3/udhcpscript.patch b/packages/busybox/busybox-1.11.3/udhcpscript.patch
index cad56d2a9f..363f66e03c 100644
--- a/packages/busybox/busybox-1.11.3/udhcpscript.patch
+++ b/packages/busybox/busybox-1.11.3/udhcpscript.patch
@@ -19,7 +19,7 @@ Index: busybox-1.11.3/examples/udhcp/simple.script
  case "$1" in
  	deconfig)
 -		/sbin/ifconfig $interface 0.0.0.0
-+		if [ ! root_is_nfs ]; then
++		if ! root_is_nfs ; then
 +			/sbin/ifconfig $interface 0.0.0.0
 +		fi
  		;;
diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index c006e31e91..b42f8ea998 100644
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/packages/cdparanoia/cdparanoia_10.2.bb b/packages/cdparanoia/cdparanoia_10.2.bb
new file mode 100644
index 0000000000..2a220336fd
--- /dev/null
+++ b/packages/cdparanoia/cdparanoia_10.2.bb
@@ -0,0 +1,33 @@
+# cdparanoia OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR ="r0"
+LICENSE="GPL"
+
+SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz \
+	 file://fixes10.patch;patch=1 \
+	 file://Makefile.in.patch;patch=1 \
+	 file://interface_Makefile.in.patch;patch=1 \
+	 file://paranoia_Makefile.in.patch;patch=1 "
+
+S="${WORKDIR}/cdparanoia-III-10.2"
+
+PARALLEL_MAKE = ""
+
+inherit autotools
+
+do_install() {
+	oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \
+		   INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install
+}
+
+do_stage() {
+	install -d ${STAGING_INCDIR} ${STAGING_LIBDIR}
+
+	install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR}
+	install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR}
+
+	oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR}
+	oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR}
+}
diff --git a/packages/cdparanoia/files/Makefile.in.patch b/packages/cdparanoia/files/Makefile.in.patch
new file mode 100644
index 0000000000..40cf4ad516
--- /dev/null
+++ b/packages/cdparanoia/files/Makefile.in.patch
@@ -0,0 +1,13 @@
+--- cdparanoia-III-10.2/Makefile.in.orig	2009-01-27 23:32:15.000000000 +0100
++++ cdparanoia-III-10.2/Makefile.in	2009-01-27 23:32:53.000000000 +0100
+@@ -87,8 +87,9 @@
+ 		$(LIBDIR)/libcdda_paranoia.so
+ 
+ cdparanoia:	$(OFILES) $(LIBDEP)
+-		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
++		$(LD) $(CFLAGS) \
+ 		-L$(PWD)/paranoia -L$(PWD)/interface \
++		$(LDFLAGS) $(OFILES) \
+ 		-o cdparanoia $(LIBS)
+ 
+ .c.o:
diff --git a/packages/cdparanoia/files/fixes10.patch b/packages/cdparanoia/files/fixes10.patch
new file mode 100644
index 0000000000..414ff3944d
--- /dev/null
+++ b/packages/cdparanoia/files/fixes10.patch
@@ -0,0 +1,25 @@
+--- cdparanoia-III-alpha9.8/configure.in	2000-03-26 00:33:22.000000000 -0700
++++ cdparanoia-III-alpha9.8.new/configure.in	2004-12-23 16:34:04.072846728 -0700
+@@ -1,7 +1,7 @@
+ AC_INIT(interface/interface.c)
+ 
+-cp $srcdir/configure.guess $srcdir/config.guess
+-cp $srcdir/configure.sub $srcdir/config.sub
++#cp $srcdir/configure.guess $srcdir/config.guess
++#cp $srcdir/configure.sub $srcdir/config.sub
+ 
+ AC_CANONICAL_HOST
+ 
+--- cdparanoia-III-alpha9.8/interface/scan_devices.c	2001-03-25 22:44:01.000000000 -0700
++++ cdparanoia-III-alpha9.8.new/interface/scan_devices.c	2004-12-23 16:38:47.128815680 -0700
+@@ -19,6 +19,10 @@
+ #include "common_interface.h"
+ #include "utils.h"
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #define MAX_DEV_LEN 20 /* Safe because strings only come from below */
+ /* must be absolute paths! */
+ static char *scsi_cdrom_prefixes[]={
diff --git a/packages/cdparanoia/files/interface_Makefile.in.patch b/packages/cdparanoia/files/interface_Makefile.in.patch
new file mode 100644
index 0000000000..4dbd2bb19a
--- /dev/null
+++ b/packages/cdparanoia/files/interface_Makefile.in.patch
@@ -0,0 +1,11 @@
+--- cdparanoia-III-10.2/interface/Makefile.in.orig	2009-01-27 23:52:42.000000000 +0100
++++ cdparanoia-III-10.2/interface/Makefile.in	2009-01-27 23:53:27.000000000 +0100
+@@ -46,7 +46,7 @@
+ 	$(RANLIB) libcdda_interface.a
+ 
+ libcdda_interface.so: 	$(OFILES)	
+-	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
++	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) $(LDFLAGS) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
+ 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
+ 	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
+ 
diff --git a/packages/cdparanoia/files/paranoia_Makefile.in.patch b/packages/cdparanoia/files/paranoia_Makefile.in.patch
new file mode 100644
index 0000000000..962a43a634
--- /dev/null
+++ b/packages/cdparanoia/files/paranoia_Makefile.in.patch
@@ -0,0 +1,11 @@
+--- cdparanoia-III-10.2/paranoia/Makefile.in.orig	2009-01-27 23:54:45.000000000 +0100
++++ cdparanoia-III-10.2/paranoia/Makefile.in	2009-01-27 23:55:05.000000000 +0100
+@@ -44,7 +44,7 @@
+ 	$(RANLIB) libcdda_paranoia.a
+ 
+ libcdda_paranoia.so: 	$(OFILES)	
+-	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
++	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) $(LDFLAGS) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
+ 	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
+ 	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
+ 
diff --git a/packages/connman/connman.inc b/packages/connman/connman.inc
index 1aa803608c..5ca77231bf 100644
--- a/packages/connman/connman.inc
+++ b/packages/connman/connman.inc
@@ -2,12 +2,16 @@ DESCRIPTION = "The Moblin Connection Manager"
 HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
 SECTION = "libs/network"
 LICENSE = "GPL"
-DEPENDS  = "dbus glib-2.0"
+# we need to define the depends here, the dynamic stuff is too late
+DEPENDS  = "dbus glib-2.0 ppp busybox dhclient resolvconf bluez4"
 
 EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
     ac_cv_path_DHCLIENT=/sbin/dhclient \
-    ac_cv_path_UDHCPC=/sbin/udhcpc"
+    ac_cv_path_UDHCPC=/sbin/udhcpc \
+    ac_cv_path_RESOLVCONF=/sbin/resolvconf \
+    ac_cv_path_PPPD=/usr/sbin/pppd \
+"
 
 INITSCRIPT_NAME = "connman"
 INITSCRIPT_PARAMS = "defaults 22"
@@ -16,6 +20,10 @@ PARALLEL_MAKE = ""
 
 inherit autotools pkgconfig update-rc.d
 
+do_configure_append() {
+	ln -sf . include/connman
+}
+
 do_install_append() {
     install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
 }
@@ -25,7 +33,7 @@ do_stage() {
 }
 
 python populate_packages_prepend() {
-	depmap = dict( pppd="pppd", udhcp="udhcpc", dhclient="dhcp-client", wifi="wpa-supplicant", resolvconf="resolvconf", bluetooth="bluez4" )
+	depmap = dict( pppd="ppp", udhcp="busybox", dhclient="dhclient", wifi="wpa-supplicant", resolvconf="resolvconf", bluetooth="bluez4" )
 	packages = []
 	hook = lambda file,pkg,b,c,d:packages.append((file,pkg))
 	plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
diff --git a/packages/connman/connman_0.8.bb b/packages/connman/connman_0.8.bb
index 2d5ad3b72a..c8f0d2ba55 100644
--- a/packages/connman/connman_0.8.bb
+++ b/packages/connman/connman_0.8.bb
@@ -1,5 +1,5 @@
 require connman.inc
-PR = "r2"
+PR = "r4"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \
diff --git a/packages/connman/connman_git.bb b/packages/connman/connman_git.bb
index a41149e3f7..7b7522fbb7 100644
--- a/packages/connman/connman_git.bb
+++ b/packages/connman/connman_git.bb
@@ -1,6 +1,6 @@
 require connman.inc
 PV = "0.8+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/dsplink/codec-engine_2.21.bb b/packages/dsplink/codec-engine_2.21.bb
index 88f2eb7620..421e46894a 100644
--- a/packages/dsplink/codec-engine_2.21.bb
+++ b/packages/dsplink/codec-engine_2.21.bb
@@ -8,7 +8,7 @@ RDEPENDS = "update-modules"
 inherit module
 
 # tconf from xdctools dislikes '.' in pwd :/
-PR = "r4"
+PR = "r5"
 PV = "221"
 
 # Get CE tarball from TI website, place in sources and calculate
@@ -62,8 +62,8 @@ do_compile_append() {
 
 
 do_stage_append() {
-    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine
-    cp -pPr ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/
+	install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine
+    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/
 }
 
 INHIBIT_PACKAGE_STRIP = "1"
diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index 3a5c7f62d7..b263be331a 100644
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -136,7 +136,7 @@ do_install () {
 # Codec Engine and friends need a complete tree, so stage it all
 do_stage() {
 	install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink
-	cp -pPr ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink/ 
+	cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink/ 
 }
 
 pkg_postinst_dsplink-module () {
diff --git a/packages/dsplink/dsplink_1.60.bb b/packages/dsplink/dsplink_1.60.bb
index fec275de4e..e8377a811c 100644
--- a/packages/dsplink/dsplink_1.60.bb
+++ b/packages/dsplink/dsplink_1.60.bb
@@ -1,7 +1,7 @@
 require dsplink.inc
 
 # The tconf tool breaks if there is a '.' in your pwd
-PR = "r5"
+PR = "r6"
 PE = "1"
 PV = "160"
 
diff --git a/packages/dsplink/gstreamer-ti_svn.bb b/packages/dsplink/gstreamer-ti_svn.bb
index d943a0c30a..9c22734dd5 100644
--- a/packages/dsplink/gstreamer-ti_svn.bb
+++ b/packages/dsplink/gstreamer-ti_svn.bb
@@ -1,4 +1,4 @@
-DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly libid3tag liboil libmad"
+DEPENDS = "codec-engine dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly libid3tag liboil libmad"
 
 SRC_URI = "svn://omapzoom.org/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https"
 SRCREV = "43"
diff --git a/packages/findutils/findutils.inc b/packages/findutils/findutils.inc
index 7feef27025..209edd60ad 100644
--- a/packages/findutils/findutils.inc
+++ b/packages/findutils/findutils.inc
@@ -12,3 +12,8 @@ inherit autotools gettext
 # because it uses __mempcpy, there are other things (TBD:
 # see diffutils.mk in buildroot)
 EXTRA_OECONF_linux-uclibc += "--without-included-regex"
+
+do_install_append() {
+	cd ${D}${bindir} && mv find find.findutils
+	cd ${D}${bindir} && mv xargs xargs.findutils
+}
diff --git a/packages/findutils/findutils_4.2.29.bb b/packages/findutils/findutils_4.2.29.bb
index 6de63af151..a89d0924f4 100644
--- a/packages/findutils/findutils_4.2.29.bb
+++ b/packages/findutils/findutils_4.2.29.bb
@@ -1,5 +1,7 @@
 require findutils.inc
 
+PR = "r1"
+
 SRC_URI += "file://mkinstalldirs.patch;patch=1"
 
 EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
diff --git a/packages/findutils/findutils_4.4.bb b/packages/findutils/findutils_4.4.bb
index 844f206460..25dec2592e 100644
--- a/packages/findutils/findutils_4.4.bb
+++ b/packages/findutils/findutils_4.4.bb
@@ -1,5 +1,6 @@
 require findutils.inc
 
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
index 65cfa4072c..8c972357f3 100644
--- a/packages/gnuradio/gnuradio.inc
+++ b/packages/gnuradio/gnuradio.inc
@@ -19,6 +19,7 @@ EXTRA_OECONF = " \
   --enable-gr-audio-oss \
   --enable-mblock \
   --disable-html-docs \
+  --with-pythondir=/usr/lib/${PYTHON_DIR}/site-packages \
   PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR} \
 "
 
diff --git a/packages/kexecboot/linux-kexecboot-2.6.21-hh20/asus620/defconfig b/packages/kexecboot/linux-kexecboot-2.6.21-hh20/asus620/defconfig
new file mode 100644
index 0000000000..8a8222abad
--- /dev/null
+++ b/packages/kexecboot/linux-kexecboot-2.6.21-hh20/asus620/defconfig
@@ -0,0 +1,1354 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21-hh20
+# Tue Dec  2 15:36:36 2008
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+C