3 files changed, 64 insertions, 1 deletions
diff --git a/packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch b/packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch
new file mode 100644
index 0000000000..391a7ae3de
--- /dev/null
+++ b/packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch
@@ -0,0 +1,14 @@
+Index: bluez-utils-3.9/common/ppoll.h
+===================================================================
+--- bluez-utils-3.9.orig/common/ppoll.h	2007-05-17 17:42:23.000000000 +0200
++++ bluez-utils-3.9/common/ppoll.h	2007-05-17 17:43:18.000000000 +0200
+@@ -1,4 +1,8 @@
+-static inline int ppoll(struct pollfd *fds, nfds_t nfds,
++#ifdef ppoll
++#undef ppoll
++#endif
++#define ppoll bluez_ppoll
++static inline int bluez_ppoll(struct pollfd *fds, nfds_t nfds,
+ 		const struct timespec *timeout, const sigset_t *sigmask)
+ {
+ 	return poll(fds, nfds, timeout ? timeout->tv_sec * 1000 : 500);
diff --git a/packages/bluez/bluez-utils/uclibc-fix.patch b/packages/bluez/bluez-utils/uclibc-fix.patch
new file mode 100644
index 0000000000..6d4753c2e5
--- /dev/null
+++ b/packages/bluez/bluez-utils/uclibc-fix.patch
@@ -0,0 +1,46 @@
+Uclibc doesn't define or support speeds above 115200. So check the existence
+of the defines before allowing them to actually be used.
+
+Index: bluez-utils-3.9/tools/hciattach.c
+===================================================================
+--- bluez-utils-3.9.orig/tools/hciattach.c	2007-05-17 12:34:28.000000000 +1000
++++ bluez-utils-3.9/tools/hciattach.c	2007-05-17 12:40:20.000000000 +1000
+@@ -105,22 +105,38 @@
+ 		return B57600;
+ 	case 115200:
+ 		return B115200;
++#ifdef B230400
+ 	case 230400:
+ 		return B230400;
++#endif
++#ifdef B460800
+ 	case 460800:
+ 		return B460800;
++#endif
++#ifdef B500000
+ 	case 500000:
+ 		return B500000;
++#endif
++#ifdef B576000
+ 	case 576000:
+ 		return B576000;
++#endif
++#ifdef B921600
+ 	case 921600:
+ 		return B921600;
++#endif
++#ifdef B1000000
+ 	case 1000000:
+ 		return B1000000;
++#endif
++#ifdef B1152000
+ 	case 1152000:
+ 		return B1152000;
++#endif
++#ifdef B1500000
+ 	case 1500000:
+ 		return B1500000;
++#endif
+ 	default:
+ 		return B57600;
+ 	}
diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb
index fba32e08e6..29c472fbbd 100644
--- a/packages/bluez/bluez-utils_3.9.bb
+++ b/packages/bluez/bluez-utils_3.9.bb
@@ -2,9 +2,12 @@ require bluez-utils.inc
 
 PACKAGES =+ "${PN}-ciptool"
 
+SRC_URI += "file://uclibc-fix.patch;patch=1 \
+            file://ppoll-uclibc-arm-r0.patch;patch=1 "
+
 FILES_${PN}-ciptool = "/bin/ciptool"
 RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
 RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
 
 
-PR = "r4"
+PR = "r5"