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

84 files changed, 7304 insertions, 711 deletions

diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb
index 73f9b8baec..3ea987c718 100644
--- a/packages/apache2/apache2-native_2.2.3.bb
+++ b/packages/apache2/apache2-native_2.2.3.bb
@@ -3,7 +3,7 @@ DEPENDS = "expat pcre"
 
 inherit native 
 
-PR ="r9"
+PR ="r10"
 SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
 
 S = "${WORKDIR}/httpd-${PV}"
@@ -20,25 +20,20 @@ do_stage () {
 	cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE}
 	cp support/apxs ${STAGING_BINDIR_NATIVE}
 	chmod 755 ${STAGING_BINDIR_NATIVE}/apxs
-	mkdir -p ${STAGING_DIR}/build
-	cp build/*.mk ${STAGING_DIR}/build
-	cat build/config_vars.mk | \
-		sed -e '/^prefix/s,staging,staging/${HOST_SYS},' | \
-		sed -e '/^includedir/s,/include,/include/apache2,' | \
-		sed -e 's,staging/bin,staging/${HOST_SYS}/bin,' > \
-			${STAGING_DIR}/build/config_vars.mk
-	cp build/instdso.sh ${STAGING_DIR}/build
+	mkdir -p ${STAGING_DIR_NATIVE}//usr/build
+	cp build/*.mk ${STAGING_DIR_NATIVE}/usr/build
+	cp build/instdso.sh ${STAGING_DIR_NATIVE}/usr/build
 	cp .libs/httpd ${STAGING_BINDIR_NATIVE}
 
 	(cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
-	  (cd ${STAGING_LIBDIR}; tar -xf - )
+	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
 	(cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
-	  (cd ${STAGING_LIBDIR}; tar -xf - )
+	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
 
-    	mkdir -p ${STAGING_INCDIR}/apache2
-    	cp include/* ${STAGING_INCDIR}/apache2
-	cp os/unix/os.h ${STAGING_INCDIR}/apache2
-	cp os/unix/unixd.h ${STAGING_INCDIR}/apache2
+	mkdir -p ${STAGING_INCDIR_NATIVE}/apache2
+	cp include/* ${STAGING_INCDIR_NATIVE}/apache2
+	cp os/unix/os.h ${STAGING_INCDIR_NATIVE}/apache2
+	cp os/unix/unixd.h ${STAGING_INCDIR_NATIVE}/apache2
 
   	cp support/envvars-std ${STAGING_BINDIR_NATIVE}/envvars
     	chmod 755 ${STAGING_BINDIR_NATIVE}/envvars
diff --git a/packages/apt/apt-native.inc b/packages/apt/apt-native.inc
index 6ee26e491a..4e4771a9cd 100644
--- a/packages/apt/apt-native.inc
+++ b/packages/apt/apt-native.inc
@@ -1,7 +1,7 @@
 require apt.inc
 inherit native
 
-DEPENDS += "dpkg-native gettext-native"
+DEPENDS = "perl-native dpkg-native gettext-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}"
 PACKAGES = ""
 USE_NLS = "yes"
diff --git a/packages/apt/apt-native_0.6.46.2.bb b/packages/apt/apt-native_0.6.46.2.bb
index 6db567f987..7bf69c01af 100644
--- a/packages/apt/apt-native_0.6.46.2.bb
+++ b/packages/apt/apt-native_0.6.46.2.bb
@@ -1,5 +1,5 @@
 require apt-native.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
diff --git a/packages/apt/apt-native_0.7.14.bb b/packages/apt/apt-native_0.7.14.bb
index 268e9df720..7628bc9741 100644
--- a/packages/apt/apt-native_0.7.14.bb
+++ b/packages/apt/apt-native_0.7.14.bb
@@ -1,6 +1,5 @@
 require apt-native.inc
-
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1 \
diff --git a/packages/apt/apt-native_0.7.19.bb b/packages/apt/apt-native_0.7.19.bb
index 268e9df720..7628bc9741 100644
--- a/packages/apt/apt-native_0.7.19.bb
+++ b/packages/apt/apt-native_0.7.19.bb
@@ -1,6 +1,5 @@
 require apt-native.inc
-
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1 \
diff --git a/packages/apt/apt-native_0.7.2.bb b/packages/apt/apt-native_0.7.2.bb
index 7bf69c01af..4b6897fa44 100644
--- a/packages/apt/apt-native_0.7.2.bb
+++ b/packages/apt/apt-native_0.7.2.bb
@@ -1,5 +1,5 @@
 require apt-native.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
diff --git a/packages/apt/apt-native_0.7.20.2.bb b/packages/apt/apt-native_0.7.20.2.bb
index 8fdfafe925..2641cd243b 100644
--- a/packages/apt/apt-native_0.7.20.2.bb
+++ b/packages/apt/apt-native_0.7.20.2.bb
@@ -1,4 +1,5 @@
 require apt-native.inc
+PR = "r1"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1 \
diff --git a/packages/apt/apt-native_0.7.3.bb b/packages/apt/apt-native_0.7.3.bb
index 4b6897fa44..f252bd382a 100644
--- a/packages/apt/apt-native_0.7.3.bb
+++ b/packages/apt/apt-native_0.7.3.bb
@@ -1,5 +1,5 @@
 require apt-native.inc
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
diff --git a/packages/bluez/bluez4_4.30.bb b/packages/bluez/bluez4_4.30.bb
index 6499e3ff43..920c2ee05d 100644
--- a/packages/bluez/bluez4_4.30.bb
+++ b/packages/bluez/bluez4_4.30.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "gst-plugins-base alsa-lib libusb-compat libusb1 dbus-glib"
 HOMEPAGE = "http://www.bluez.org"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
diff --git a/packages/busybox/busybox-static-1.11.3/B921600.patch b/packages/busybox/busybox-static-1.11.3/B921600.patch
new file mode 100644
index 0000000000..61cc32b0e5
--- /dev/null
+++ b/packages/busybox/busybox-static-1.11.3/B921600.patch
@@ -0,0 +1,13 @@
+diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c
+--- busybox-1.7.2/libbb/speed_table.c	2007-09-03 13:48:41.000000000 +0200
++++ busybox-1.7.2-921600/libbb/speed_table.c	2008-10-09 16:23:26.269592899 +0200
+@@ -52,6 +52,9 @@ static const struct speed_map speeds[] =
+ #ifdef B460800
+ 	{B460800, 460800/256 + 0x8000U},
+ #endif
++#ifdef B921600
++	{B921600, 921600/256 + 0x8000U},
++#endif
+ };
+ 
+ enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
diff --git a/packages/dpkg/dpkg-native.inc b/packages/dpkg/dpkg-native.inc
new file mode 100644
index 0000000000..5d14527341
--- /dev/null
+++ b/packages/dpkg/dpkg-native.inc
@@ -0,0 +1,24 @@
+require dpkg.inc
+
+inherit native
+
+DEPENDS = "bzip2-native zlib-native virtual/update-alternatives-native"
+
+SRC_URI += "file://noman.patch;patch=1"
+FILESPATH += "dpkg-${PV}"
+
+PERL_LIBDIR = "${STAGING_LIBDIR}/perl"
+
+EXTRA_OECONF = "--without-static-progs \
+		--without-dselect \
+		--with-start-stop-daemon \
+		--with-zlib \
+		--with-bz2lib \
+		--without-selinux \
+		--without-sgml-doc"
+
+do_stage_append() {
+	for BIN in dpkg-architecture; do
+		sed -i -e '1s,^#.*usr/bin,#!${STAGING_BINDIR},' ${STAGING_BINDIR}/$BIN
+	done
+}
diff --git a/packages/dpkg/dpkg-native_1.13.22.bb b/packages/dpkg/dpkg-native_1.13.22.bb
index 5dcf53c164..5a1f6abc50 100644
--- a/packages/dpkg/dpkg-native_1.13.22.bb
+++ b/packages/dpkg/dpkg-native_1.13.22.bb
@@ -1,14 +1,3 @@
-require dpkg.inc
-PR = "r4"
-DEPENDS += "zlib-native virtual/update-alternatives-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--with-bz2lib \
-		--without-selinux \
-		--without-sgml-doc"
+PR = "r5"
diff --git a/packages/dpkg/dpkg-native_1.13.25.bb b/packages/dpkg/dpkg-native_1.13.25.bb
index 0d60e0bddb..47c03424be 100644
--- a/packages/dpkg/dpkg-native_1.13.25.bb
+++ b/packages/dpkg/dpkg-native_1.13.25.bb
@@ -1,14 +1,3 @@
-require dpkg.inc
-PR = "r0"
-DEPENDS += "zlib-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--with-bz2lib \
-                --without-selinux \
-		--without-sgml-doc"
+PR = "r1"
diff --git a/packages/dpkg/dpkg-native_1.14.19.bb b/packages/dpkg/dpkg-native_1.14.19.bb
index f8d6705bb7..47c03424be 100644
--- a/packages/dpkg/dpkg-native_1.14.19.bb
+++ b/packages/dpkg/dpkg-native_1.14.19.bb
@@ -1,15 +1,3 @@
-require dpkg.inc
-DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-FILESPATH += "dpkg-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--with-bz2lib \
-                --without-selinux \
-		--without-sgml-doc"
+PR = "r1"
diff --git a/packages/dpkg/dpkg-native_1.14.23.bb b/packages/dpkg/dpkg-native_1.14.23.bb
index f8d6705bb7..47c03424be 100644
--- a/packages/dpkg/dpkg-native_1.14.23.bb
+++ b/packages/dpkg/dpkg-native_1.14.23.bb
@@ -1,15 +1,3 @@
-require dpkg.inc
-DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-FILESPATH += "dpkg-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--with-bz2lib \
-                --without-selinux \
-		--without-sgml-doc"
+PR = "r1"
diff --git a/packages/dpkg/dpkg-native_1.14.25.bb b/packages/dpkg/dpkg-native_1.14.25.bb
index f8d6705bb7..47c03424be 100644
--- a/packages/dpkg/dpkg-native_1.14.25.bb
+++ b/packages/dpkg/dpkg-native_1.14.25.bb
@@ -1,15 +1,3 @@
-require dpkg.inc
-DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-FILESPATH += "dpkg-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "--without-static-pr