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

102 files changed, 4227 insertions, 7371 deletions

diff --git a/recipes/ace/ace.inc b/recipes/ace/ace.inc
new file mode 100644
index 0000000000..f2afc48a44
--- /dev/null
+++ b/recipes/ace/ace.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "C++ network programming framework"
+SECTION = "net"
+LICENSE = "http://www.cs.wustl.edu/~schmidt/ACE-copying.html"
+
+DEPENDS += "openssl gperf-native"
+
+SRC_URI = "ftp://download.dre.vanderbilt.edu/previous_versions/ACE-${PV}.tar.bz2"
+S = "${WORKDIR}/ACE_wrappers"
+B = "${WORKDIR}/build.${TARGET_SYS}"
+
+EXTRA_OECONF += "--disable-ace-tests --disable-gperf"
+LEAD_SONAME = "libACE-[0-9.]*.so"
+
+inherit autotools
+
+do_configure_prepend() {
+	export ace_cv_linux_event_poll=yes
+}
diff --git a/recipes/ace/ace_5.6.8.bb b/recipes/ace/ace_5.6.8.bb
new file mode 100644
index 0000000000..345abe17e4
--- /dev/null
+++ b/recipes/ace/ace_5.6.8.bb
@@ -0,0 +1 @@
+require ace.inc
diff --git a/recipes/argp-standalone/argp-standalone_1.3.bb b/recipes/argp-standalone/argp-standalone_1.3.bb
new file mode 100644
index 0000000000..6de77ef928
--- /dev/null
+++ b/recipes/argp-standalone/argp-standalone_1.3.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Argp is an interface for parsing unix-style argument vectors. This is only needed for uclibc"
+PRIORITY = "optional"
+
+SRC_URI = "http://www.auto.tuwien.ac.at/~mkoegler/eib/argp-standalone-${PV}.tar.gz"
+
+inherit autotools
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/recipes/base-passwd/files/hipox/root-home.patch b/recipes/base-passwd/files/hipox/root-home.patch
new file mode 100644
index 0000000000..14960496fa
--- /dev/null
+++ b/recipes/base-passwd/files/hipox/root-home.patch
@@ -0,0 +1,8 @@
+--- base-passwd/passwd.master.orig	2005-07-08 06:26:22.000000000 +0200
++++ base-passwd/passwd.master	2005-07-08 06:31:58.000000000 +0200
+@@ -1,4 +1,4 @@
+-root::0:0:root:/root:/bin/sh
++root:D5wG08PcdvCQ.:0:0:root:/home/root:/bin/sh
+ daemon:*:1:1:daemon:/usr/sbin:/bin/sh
+ bin:*:2:2:bin:/bin:/bin/sh
+ sys:*:3:3:sys:/dev:/bin/sh
diff --git a/recipes/binutils/binutils-canadian-sdk_2.18.bb b/recipes/binutils/binutils-canadian-sdk_2.18.bb
index e44e7b7144..96726f82a8 100644
--- a/recipes/binutils/binutils-canadian-sdk_2.18.bb
+++ b/recipes/binutils/binutils-canadian-sdk_2.18.bb
@@ -2,11 +2,7 @@ SECTION = "devel"
 require binutils_${PV}.bb
 inherit canadian-sdk
 
-DEPENDS="\
-	virtual/${HOST_PREFIX}binutils \
-	virtual/${HOST_PREFIX}gcc \
-	flex-native bison-native \
-"
+DEPENDS = "flex-native bison-native"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 # On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW}
diff --git a/recipes/bluez/bluez4_4.35.bb b/recipes/bluez/bluez4_4.35.bb
index fec1411d00..ce9c5a36ea 100644
--- a/recipes/bluez/bluez4_4.35.bb
+++ b/recipes/bluez/bluez4_4.35.bb
@@ -6,7 +6,8 @@ HOMEPAGE = "http://www.bluez.org"
 LICENSE = "GPL"
 
 # For angstrom we want this to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-libs"
+PROVIDES_append_angstrom = " bluez-utils bluez-libs"
+
 
 PR = "r1"
 
diff --git a/recipes/bustle/bustle-dbus-monitor_0.2.0.bb b/recipes/bustle/bustle-dbus-monitor_0.2.0.bb
new file mode 100644
index 0000000000..4d4768f4de
--- /dev/null
+++ b/recipes/bustle/bustle-dbus-monitor_0.2.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "The monitoring utilitiy for the Bustle D-Bus diagram application."
+HOMEPAGE = "http://www.willthompson.co.uk/bustle"
+DEPENDS = "dbus glib-2.0"
+LICENSE = "LGPL"
+SECTION = "console/network"
+
+SRC_URI = "http://www.willthompson.co.uk/bustle/releases/bustle-${PV}.tar.gz"
+S = "${WORKDIR}/bustle-${PV}"
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} `pkg-config --cflags --libs dbus-1 glib-2.0` -o bustle-dbus-monitor bustle-dbus-monitor.c
+}
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -m 0755 bustle-dbus-monitor ${D}${sbindir}
+}
+
+FILES_${PN} += "${sbindir}"
diff --git a/recipes/busybox/files/busybox-appletlib-dependency.patch b/recipes/busybox/files/busybox-appletlib-dependency.patch
index 85a61e8cf5..3efd4c0882 100644
--- a/recipes/busybox/files/busybox-appletlib-dependency.patch
+++ b/recipes/busybox/files/busybox-appletlib-dependency.patch
@@ -1,11 +1,15 @@
---- a/libbb/Kbuild	2008-11-09 20:28:09.000000000 +0300
-+++ b/libbb/Kbuild	2009-02-17 17:41:48.718747865 +0300
-@@ -147,3 +147,8 @@ lib-$(CONFIG_PGREP) += xregcomp.o
- lib-$(CONFIG_PKILL) += xregcomp.o
- lib-$(CONFIG_DEVFSD) += xregcomp.o
- lib-$(CONFIG_FEATURE_FIND_REGEX) += xregcomp.o
+Index: busybox-1.13.2/Makefile
+===================================================================
+--- busybox-1.13.2.orig/Makefile	2009-03-19 15:44:37.419270265 +0300
++++ busybox-1.13.2/Makefile	2009-03-19 15:45:57.737521296 +0300
+@@ -471,6 +471,10 @@
+ 		util-linux/ \
+ 		util-linux/volume_id/ \
+ 
++# Lib interdeps
++# libbb uses headers generated in applets
++libbb: applets
 +
-+libbb/appletlib.o: include/usage_compressed.h include/applet_tables.h
-+
-+include/usage_compressed.h include/applet_tables.h:
-+        $(Q)$(MAKE) $(build)=applets $@
+ endif # KBUILD_EXTMOD
+ 
+ ifeq ($(dot-config),1)
diff --git a/recipes/clamav/clamav.inc b/recipes/clamav/clamav.inc
index 49b8023a53..5b2069e739 100644
--- a/recipes/clamav/clamav.inc
+++ b/recipes/clamav/clamav.inc
@@ -19,7 +19,6 @@ RRECOMMENDS_${PN}-daemon = "${PN}-freshclam"
 RPROVIDES_${PN}-freshclam = "${PN}-data"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \
-          file://cross-compile-fix.patch;patch=1 \
           file://clamav-daemon.init \
           file://clamav-freshclam.init \
           file://clamd.conf \
@@ -67,10 +66,11 @@ do_stage () {
 PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib \
              ${PN}-clamconf"
 
+LEAD_SONAME = "libclamav.so.*"
 FILES_${PN} = "${bindir}/clamscan \
                ${bindir}/sigtool \
                ${bindir}/clamdscan"
-FILES_${PN}-lib = "${libdir}/libclamav.so.*"
+FILES_${PN}-lib = "${libdir}/libclamav.so.* ${libdir}/libclamunrar.so* ${libdir}/libclamunrar_iface.so*"
 FILES_${PN}-conf = "${sysconfdir}/clamd.conf"
 FILES_${PN}-clamconf = "${bindir}/clamconf"
 FILES_${PN}-freshclam = "${bindir}/freshclam \
diff --git a/recipes/clamav/clamav_0.90.2.bb b/recipes/clamav/clamav_0.90.2.bb
index 9592adf914..740c02a90e 100644
--- a/recipes/clamav/clamav_0.90.2.bb
+++ b/recipes/clamav/clamav_0.90.2.bb
@@ -1,3 +1,5 @@
 require clamav.inc
 
+SRC_URI += "file://cross-compile-fix.patch;patch=1"
+
 PR = "r2"
diff --git a/recipes/clamav/clamav_0.90.3.bb b/recipes/clamav/clamav_0.90.3.bb
index e721558efe..2227f01f07 100644
--- a/recipes/clamav/clamav_0.90.3.bb
+++ b/recipes/clamav/clamav_0.90.3.bb
@@ -1,3 +1,5 @@
 require clamav.inc