Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010

Conflicts:
	recipes/linux/linux-openmoko-devel_git.bb
	recipes/openmoko-3rdparty/pisi_0.5.2.bb
	recipes/openmoko-3rdparty/pisi_0.5.3.bb
	recipes/openmoko-3rdparty/pisi_0.5.bb
	recipes/uclibc/uclibc_nptl.bb

18 files changed, 59 insertions, 27 deletions

diff --git a/recipes/bluez/bcm2035-tool_0.0.bb b/recipes/bluez/bcm2035-tool_0.0.bb
index 156c7e1295..51173c5553 100644
--- a/recipes/bluez/bcm2035-tool_0.0.bb
+++ b/recipes/bluez/bcm2035-tool_0.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz \
-           file://addr-as-arg.patch;patch=1 \
+           file://addr-as-arg.patch \
 	   "
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/bluez/bluez-cups-backend_3.33.bb b/recipes/bluez/bluez-cups-backend_3.33.bb
index 0a0e26c69b..736c03dfa0 100644
--- a/recipes/bluez/bluez-cups-backend_3.33.bb
+++ b/recipes/bluez/bluez-cups-backend_3.33.bb
@@ -6,7 +6,7 @@ DEPENDS += "cups"
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
+SRC_URI += "file://hciattach-ti-bts.patch"
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/recipes/bluez/bluez-gnome_1.8.bb b/recipes/bluez/bluez-gnome_1.8.bb
index 57629b37c9..4d9cbfaf00 100644
--- a/recipes/bluez/bluez-gnome_1.8.bb
+++ b/recipes/bluez/bluez-gnome_1.8.bb
@@ -6,8 +6,8 @@ DEPENDS = "dbus-glib gconf libnotify gtk+"
 RRECOMMENDS = "gnome-icon-theme"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/${P}.tar.gz \
-	   file://add-device-from-rfcomm-crash.patch;patch=1 \
-	   file://cs-typo.patch;patch=1"
+	   file://add-device-from-rfcomm-crash.patch \
+	   file://cs-typo.patch"
 
 inherit autotools pkgconfig gconf mime
 
diff --git a/recipes/bluez/bluez-gnome_git.bb b/recipes/bluez/bluez-gnome_git.bb
index 267f3f9e5d..710987b227 100644
--- a/recipes/bluez/bluez-gnome_git.bb
+++ b/recipes/bluez/bluez-gnome_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+"
 
 SRCREV = "c4ccbf7c4d0aa55e234d30e6daee494e496c7c7f"
 SRC_URI = "git://git.kernel.org/pub/scm/bluetooth/bluez-gnome.git;protocol=git;branch=master "
-#           file://pkgconfig-add-gthread.patch;patch=1 "
+#           file://pkgconfig-add-gthread.patch "
 
 PV = "0.10+gitr${SRCREV}"
 S = "${WORKDIR}/git"
diff --git a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
index e1dff24044..1cc93efe78 100644
--- a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
+++ b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
@@ -6,7 +6,7 @@ DEPENDS += "gstreamer gst-plugins-base "
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;patch=1" 
+SRC_URI += "file://hciattach-ti-bts.patch" 
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/recipes/bluez/bluez-hcidump_1.42.bb b/recipes/bluez/bluez-hcidump_1.42.bb
index ef0209c5cd..e83729de05 100644
--- a/recipes/bluez/bluez-hcidump_1.42.bb
+++ b/recipes/bluez/bluez-hcidump_1.42.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
 SECTION = "console"
 PRIORITY = "optional"
 DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-PR = "r0"
+LICENSE = "GPLv2"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
 S = "${WORKDIR}/bluez-hcidump-${PV}"
diff --git a/recipes/bluez/bluez-utils-alsa_3.33.bb b/recipes/bluez/bluez-utils-alsa_3.33.bb
index 407fcd954c..c48ed1bef8 100644
--- a/recipes/bluez/bluez-utils-alsa_3.33.bb
+++ b/recipes/bluez/bluez-utils-alsa_3.33.bb
@@ -6,7 +6,7 @@ DEPENDS += "alsa-lib"
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;patch=1" 
+SRC_URI += "file://hciattach-ti-bts.patch" 
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/recipes/bluez/bluez-utils.inc b/recipes/bluez/bluez-utils.inc
index 7c84f4e1d5..9933748eb6 100644
--- a/recipes/bluez/bluez-utils.inc
+++ b/recipes/bluez/bluez-utils.inc
@@ -10,14 +10,14 @@ LICENSE = "GPL"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
-	file://hciattach-ti-bts.patch;patch=1 \
-        file://handle-eintr.patch;patch=1;status=applied"
+	file://hciattach-ti-bts.patch \
+        file://handle-eintr.patch;status=applied"
 SRC_URI_append_r1000      = " file://hciattach.sh"
 SRC_URI_append_ghi270      = " file://hciattach.sh"
 
 # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
 # Let's default to that instead of 'any' until further notice...
-SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
+SRC_URI += " file://default-manfid-0x0-to-bcps.patch"
 
 S = "${WORKDIR}/bluez-utils-${PV}"
 
diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc
index df071b76d9..d75745954d 100644
--- a/recipes/bluez/bluez-utils3.inc
+++ b/recipes/bluez/bluez-utils3.inc
@@ -12,7 +12,7 @@ FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
-           file://sbc-thumb.patch;patch=1"
+           file://sbc-thumb.patch"
 
 
 S = "${WORKDIR}/bluez-utils-${PV}"
diff --git a/recipes/bluez/bluez-utils_3.33.bb b/recipes/bluez/bluez-utils_3.33.bb
index d7ae808abc..8d202dad78 100644
--- a/recipes/bluez/bluez-utils_3.33.bb
+++ b/recipes/bluez/bluez-utils_3.33.bb
@@ -4,7 +4,7 @@ PR = "r3"
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;patch=1" 
+SRC_URI += "file://hciattach-ti-bts.patch" 
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/recipes/bluez/bluez4-libs.inc b/recipes/bluez/bluez4-libs.inc
index 4da389cdbb..0083f15440 100644
--- a/recipes/bluez/bluez4-libs.inc
+++ b/recipes/bluez/bluez4-libs.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 INC_PR = "r1"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-        file://avinfo-link.patch;patch=1;pnum=0"
+        file://avinfo-link.patch;striplevel=0"
 
 S = "${WORKDIR}/bluez-${PV}"
 
diff --git a/recipes/bluez/bluez4.inc b/recipes/bluez/bluez4.inc
index 3bbfb9add7..1807c95ea7 100644
--- a/recipes/bluez/bluez4.inc
+++ b/recipes/bluez/bluez4.inc
@@ -2,9 +2,9 @@ DESCRIPTION = "Linux Bluetooth Stack Userland V4"
 HOMEPAGE = "http://www.bluez.org"
 SECTION = "libs"
 PRIORITY = "optional"
-LICENSE = "GPL"
+LICENSE = "GPLv2/LGPLv2.1"
 DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib"
-INC_PR = "r6"
+INC_PR = "r7"
 
 # temporary solution until bug 5176 is properly fixed
 PROVIDES += "bluez-utils bluez-libs bluez-utils-dbus"
@@ -13,8 +13,8 @@ RPROVIDES_bluez4-dev = "bluez-libs-dev"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
+  file://fix-dfutool-usb-declaration-mismatch.patch \
+  file://sbc-thumb.patch \
   file://bluetooth.conf \
 "
 S = "${WORKDIR}/bluez-${PV}"
diff --git a/recipes/bluez/bluez4_4.31.bb b/recipes/bluez/bluez4_4.31.bb
index 6f32474166..17fd98f462 100644
--- a/recipes/bluez/bluez4_4.31.bb
+++ b/recipes/bluez/bluez4_4.31.bb
@@ -8,10 +8,10 @@ PR = "r7"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
+  file://fix-dfutool-usb-declaration-mismatch.patch \
+  file://sbc-thumb.patch \
   file://bluetooth.conf \
-#  file://hid2hci_usb_init.patch;patch=1 \
+#  file://hid2hci_usb_init.patch \
 "
 S = "${WORKDIR}/bluez-${PV}"
 
diff --git a/recipes/bluez/bluez4_4.35.bb b/recipes/bluez/bluez4_4.35.bb
index 5c10cfad1d..1b2260251f 100644
--- a/recipes/bluez/bluez4_4.35.bb
+++ b/recipes/bluez/bluez4_4.35.bb
@@ -15,8 +15,8 @@ PR = "r2"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
+  file://fix-dfutool-usb-declaration-mismatch.patch \
+  file://sbc-thumb.patch \
   file://bluetooth.conf \
 "
 S = "${WORKDIR}/bluez-${PV}"
diff --git a/recipes/bluez/bluez4_4.37.bb b/recipes/bluez/bluez4_4.37.bb
index 6ec1b1c282..b1dabd1a1a 100644
--- a/recipes/bluez/bluez4_4.37.bb
+++ b/recipes/bluez/bluez4_4.37.bb
@@ -15,8 +15,8 @@ PR = "r1"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
+  file://fix-dfutool-usb-declaration-mismatch.patch \
+  file://sbc-thumb.patch \
   file://bluetooth.conf \
 "
 S = "${WORKDIR}/bluez-${PV}"
diff --git a/recipes/bluez/obexd_0.22.bb b/recipes/bluez/obexd_0.22.bb
index 1731cd2a94..c305b10a40 100644
--- a/recipes/bluez/obexd_0.22.bb
+++ b/recipes/bluez/obexd_0.22.bb
@@ -5,7 +5,7 @@ DEPENDS_append_shr = " libframeworkd-glib "
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz;name=archive"
-SRC_URI_append_shr = " file://obexd-add-fso-support.patch;patch=1 "
+SRC_URI_append_shr = " file://obexd-add-fso-support.patch "
 SRC_URI[archive.md5sum] = "ed59a0e357b56d2a2ba0d1de6a0cc109"
 SRC_URI[archive.sha256sum] = "b6a0217abafd2fd78c33ef8b9d64bb83da014c67c1ed594c475129a1b326e137"
 
diff --git a/recipes/bluez/ussp-push-0.11/hci_remote_name.patch b/recipes/bluez/ussp-push-0.11/hci_remote_name.patch
new file mode 100644
index 0000000000..c760608be5
--- /dev/null
+++ b/recipes/bluez/ussp-push-0.11/hci_remote_name.patch
@@ -0,0 +1,13 @@
+diff -urN ussp-push-0.11/src/obex_socket.c ussp-push-0.11_Demo/src/obex_socket.c
+--- ussp-push-0.11/src/obex_socket.c	2008-08-25 02:18:53.000000000 +0530
++++ ussp-push-0.11_Demo/src/obex_socket.c	2010-04-16 15:11:27.000000000 +0530
+@@ -197,7 +197,8 @@
+ 	for (i = 0; i < niinf; i++) {
+ 		char devname[128];
+ 
+-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++		if (hci_read_remote_name(dd, &piinf[i].bdaddr,
++					sizeof(devname) - 1,
+ 				    devname, 100000) >= 0) {
+ 			if (strcasecmp(devname, btname) == 0) {
+ 				*btaddr = piinf[i].bdaddr;
diff --git a/recipes/bluez/ussp-push_0.11.bb b/recipes/bluez/ussp-push_0.11.bb
new file mode 100644
index 0000000000..42b9008805
--- /dev/null
+++ b/recipes/bluez/ussp-push_0.11.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "OBEX object pusher"
+HOMEPAGE = "http://www.xmailserver.org/ussp-push.html"
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs openobex"
+LICENSE = "GPLv2"
+PR = "r1"
+
+SRC_URI = "http://www.xmailserver.org/ussp-push-${PV}.tar.gz \
+	file://hci_remote_name.patch"
+
+S = "${WORKDIR}/ussp-push-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
+
+SRC_URI[md5sum] = "5c44983ee27809867041feff6bb4423a"
+SRC_URI[sha256sum] = "bb2748eaed6164812555b4a1e186c4f2820c5ef9ce30f12d7aac28a452719bbd"