This email list is read-only. Emails sent to this list will be discarded
----------------------------------
meta/packages/bluez/bluez-hcidump_1.40.bb | 12 -
meta/packages/bluez/bluez-hcidump_1.42.bb | 13 +
meta/packages/bluez/bluez-libs_3.18.bb | 1 -
meta/packages/bluez/bluez-libs_3.30.bb | 1 -
meta/packages/bluez/bluez-libs_3.36.bb | 1 +
meta/packages/bluez/bluez-utils.inc | 53 ---
.../packages/bluez/bluez-utils/add-init-deps.patch | 21 -
meta/packages/bluez/bluez-utils/add-restart.patch | 21 -
meta/packages/bluez/bluez-utils/allow-no-hal.patch | 26 -
.../bluez/bluez-utils/hciattach-ti-bts.patch | 489 --------------------
meta/packages/bluez/bluez-utils/hcid.conf | 4 +-
meta/packages/bluez/bluez-utils3.inc | 141 ++++++
meta/packages/bluez/bluez-utils_3.18.bb | 112 -----
meta/packages/bluez/bluez-utils_3.36.bb | 64 +++
meta/packages/bluez/bluez4_4.7.bb | 11 +
.../0.1.0-beta1-gcc3.4-fix.patch | 13 +
.../libusb/libusb-compat_0.0.9+0.1.0-beta2.bb | 39 ++
.../libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch | 13 +
meta/packages/libusb/libusb1_0.9.2.bb | 30 ++
19 files changed, 327 insertions(+), 738 deletions(-)
New commits:
commit 35994a063da89befc428cfd35157ecac4b27652a
Merge: f473d75c15b26b7ad3ef359d1ec046b2ced56382
1c05260e7d27effa1f88d1e0b351afa2cf90de77
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Fri Nov 7 11:16:36 2008 +0000
Merge branch 'master' of [EMAIL PROTECTED]:poky
commit f473d75c15b26b7ad3ef359d1ec046b2ced56382
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Fri Nov 7 11:15:58 2008 +0000
bluez: Upgrade to more recent 3.x versions and add bluez 4 from OE
commit 5be917f9d14d67a5ea8d363a9986859c546128f5
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Fri Nov 7 11:13:20 2008 +0000
libusb: Add versions required for recent bluez
Diff in this email is a maximum of 400 lines.
diff --git a/meta/packages/bluez/bluez-hcidump_1.40.bb
b/meta/packages/bluez/bluez-hcidump_1.40.bb
deleted file mode 100644
index 1757bd5..0000000
--- a/meta/packages/bluez/bluez-hcidump_1.40.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz";
-S = "${WORKDIR}/bluez-hcidump-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR}
--with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/meta/packages/bluez/bluez-hcidump_1.42.bb
b/meta/packages/bluez/bluez-hcidump_1.42.bb
new file mode 100644
index 0000000..877c8db
--- /dev/null
+++ b/meta/packages/bluez/bluez-hcidump_1.42.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz";
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR}
--with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
diff --git a/meta/packages/bluez/bluez-libs_3.18.bb
b/meta/packages/bluez/bluez-libs_3.18.bb
deleted file mode 100644
index 6ddf62a..0000000
--- a/meta/packages/bluez/bluez-libs_3.18.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/meta/packages/bluez/bluez-libs_3.30.bb
b/meta/packages/bluez/bluez-libs_3.30.bb
deleted file mode 100644
index 6ddf62a..0000000
--- a/meta/packages/bluez/bluez-libs_3.30.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/meta/packages/bluez/bluez-libs_3.36.bb
b/meta/packages/bluez/bluez-libs_3.36.bb
new file mode 100644
index 0000000..6ddf62a
--- /dev/null
+++ b/meta/packages/bluez/bluez-libs_3.36.bb
@@ -0,0 +1 @@
+require bluez-libs.inc
diff --git a/meta/packages/bluez/bluez-utils.inc
b/meta/packages/bluez/bluez-utils.inc
deleted file mode 100644
index 39b8b39..0000000
--- a/meta/packages/bluez/bluez-utils.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} libusb dbus"
-PROVIDES = "bluez-utils-dbus"
-RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
-RREPLACES_${PN} = "bluez-utils-dbus"
-RCONFLICTS_${PN} = "bluez-utils-nodbus"
-LICENSE = "GPL"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf "
-
-# 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"
-
-S = "${WORKDIR}/bluez-utils-${PV}"
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
-do_install_append() {
- install -d ${D}${base_sbindir} ${D}${base_bindir}/
${D}${sysconfdir}/apm/event.d/
- mv ${D}${sbindir}/* ${D}${base_sbindir}/
- mv ${D}${bindir}/* ${D}${base_bindir}/
- rmdir ${D}${bindir} ${D}${sbindir}
- chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
- install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- # libtool 2.2.2 doesn't put this in a .libs directory
- if [ -e ${S}/daemon/.libs/passkey-agent ]; then
- install -m 0755 ${S}/daemon/.libs/passkey-agent
${D}${base_bindir}/
- else
- install -m 0755 ${S}/daemon/passkey-agent ${D}${base_bindir}/
- fi
-}
-
-PACKAGES =+ "${PN}-alsa ${PN}-alsa-dev gst-plugin-bluez gst-plugin-bluez-dbg"
-
-FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
-FILES_${PN}-alsa-dev += " ${libdir}/alsa-lib/*.la "
-
-FILES_gst-plugin-bluez = "${libdir}/gstreamer*/libgstblue*.so"
-FILES_gst-plugin-bluez-dbg = "${libdir}/gstreamer*/.debug/libgstblue*.so"
-
-#
-# CUPS support
-#
-#PACKAGES =+ " bluez-cups-backend"
-#FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-#RDEPENDS_bluez-cups-backend = "cups"
diff --git a/meta/packages/bluez/bluez-utils/add-init-deps.patch
b/meta/packages/bluez/bluez-utils/add-init-deps.patch
deleted file mode 100644
index 45bcce5..0000000
--- a/meta/packages/bluez/bluez-utils/add-init-deps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
----
- scripts/bluetooth.init | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- bluez-utils-3.18.orig/scripts/bluetooth.init
-+++ bluez-utils-3.18/scripts/bluetooth.init
-@@ -1,6 +1,14 @@
- #!/bin/sh
-+### BEGIN INIT INFO
-+# Provides: bluetooth
-+# Required-Start: $local_fs $syslog $remote_fs dbus
-+# Required-Stop: $local_fs $syslog $remote_fs
-+# Default-Start: 2 3 4 5
-+# Default-Stop: 0 1 6
-+# Short-Description: Start bluetooth daemons
-+### END INIT INFO
- #
- # Start/stop the Bluetooth daemons
- #
-
- set -e
diff --git a/meta/packages/bluez/bluez-utils/add-restart.patch
b/meta/packages/bluez/bluez-utils/add-restart.patch
deleted file mode 100644
index e37beff..0000000
--- a/meta/packages/bluez/bluez-utils/add-restart.patch
+++ /dev/null
@@ -1,21 +0,0 @@
----
- scripts/bluetooth.init | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- bluez-utils-3.18.orig/scripts/bluetooth.init
-+++ bluez-utils-3.18/scripts/bluetooth.init
-@@ -47,10 +47,14 @@ case "$1" in
- echo -n "Stopping $DESC:"
- killall $DAEMON_NAME > /dev/null 2>&1 || true
- echo -n " $DAEMON_NAME"
- echo "."
- ;;
-+ restart)
-+ $0 stop
-+ $0 start
-+ ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop}" >&2
- exit 1
- ;;
diff --git a/meta/packages/bluez/bluez-utils/allow-no-hal.patch
b/meta/packages/bluez/bluez-utils/allow-no-hal.patch
deleted file mode 100644
index 3350c80..0000000
--- a/meta/packages/bluez/bluez-utils/allow-no-hal.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- configure.in | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-Index: bluez-utils-3.18/configure.in
-===================================================================
---- bluez-utils-3.18.orig/configure.in 2007-09-02 17:40:57.000000000 +0100
-+++ bluez-utils-3.18/configure.in 2007-10-15 11:45:01.000000000 +0100
-@@ -31,7 +31,16 @@ AC_PATH_ALSA
- AC_PATH_GSTREAMER
- AC_PATH_OPENOBEX
- AC_PATH_OPENSYNC
--AC_PATH_HAL
-+
-+AC_DEFUN([AC_PATH_HAL], [
-+ PKG_CHECK_MODULES(HAL, hal >= 0.5.8, hal_found=yes, hal_found=no)
-+])
-+
-+AC_SUBST(HAL_CFLAGS)
-+AC_SUBST(HAL_LIBS)
-+
-+AM_CONDITIONAL(HAL, test "${hal_enable}" = "yes" && test "${hal_found}" =
"yes")
-+
- AC_PATH_USB
- AC_PATH_EXPAT
- AC_PATH_INOTIFY
diff --git a/meta/packages/bluez/bluez-utils/hciattach-ti-bts.patch
b/meta/packages/bluez/bluez-utils/hciattach-ti-bts.patch
deleted file mode 100644
index 217c326..0000000
--- a/meta/packages/bluez/bluez-utils/hciattach-ti-bts.patch
+++ /dev/null
@@ -1,489 +0,0 @@
---- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000
+0200
-+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200
-@@ -58,6 +58,8 @@
- #define HCI_UART_3WIRE 2
- #define HCI_UART_H4DS 3
-
-+#include "ti_bts.h"
-+
- struct uart_t {
- char *type;
- int m_id;
-@@ -67,6 +69,7 @@
- int speed;
- int flags;
- int (*init) (int fd, struct uart_t *u, struct termios *ti);
-+ char *bts; /* bluetooth script */
- };
-
- #define FLOW_CTL 0x0001
-@@ -256,6 +259,114 @@
- return 0;
- }
-
-+static int brf6150(int fd, struct uart_t *u, struct termios *ti)
-+{
-+ bts_t *bfp;
-+ int i;
-+ unsigned long vers;
-+ unsigned char actionbuf[256];
-+ unsigned char resp[128]; /* Response */
-+ unsigned long count;
-+ unsigned short atype;
-+
-+ if (u->bts == NULL) /* no script, ignore */
-+ return 0;
-+
-+ bfp = bts_load_script( u->bts, &vers );
-+ if (bfp == NULL)
-+ return -1;
-+
-+ fprintf( stderr, "Loading BTS script version %lu\n", vers );
-+
-+ while ((count = bts_next_action( bfp, actionbuf,
-+ sizeof actionbuf - 1, &atype )) != 0) {
-+ if (atype == ACTION_REMARKS) {
-+ if (actionbuf[0] != 0)
-+ fprintf( stderr, "%s\n", actionbuf );
-+ }
-+ else if (atype == ACTION_SEND_COMMAND) {
-+#if 0
-+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ int n;
-+ n = write(fd, actionbuf, count);
-+ if (n < 0 || n < count) {
-+ perror("Failed to write TI action command");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_WAIT_EVENT) {
-+ action_wait_t *wait = (action_wait_t *)actionbuf;
-+#if 0
-+ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size,
data = ", wait->msec, wait->size );
-+ for (i=0; i<wait->size; i++) {
-+ fprintf( stderr, "0x%02x ", wait->data[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ usleep(wait->msec); /* seems they give usec, not
msec */
-+ /* Read reply. */
-+ if ((count = read_hci_event(fd, resp, sizeof resp)) <
0) {
-+ perror("Failed to read TI command response");
-+ return -1;
-+ }
-+ if (count < wait->size) {
-+ fprintf( stderr, "TI command response is
short.");
-+ }
-+ for (i=0; i<wait->size; i++) {
-+ if (i == 3) continue; /* ignore */
-+ if (resp[i] != wait->data[i]) {
-+ fprintf( stderr, "TI command response
does not match expected result.\n" );
-+ }
-+ }
-+ }
-+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
-+ action_serial_t *sercmd = (action_serial_t *)actionbuf;
-+
-+ /* Set actual baudrate */
-+ fprintf( stderr,
-+ "BTS changing baud rate to %u, flow control to
%u\n",
-+ sercmd->baud, sercmd->flow_control );
-+
-+ tcflush(fd, TCIOFLUSH);
-+
-+ if (sercmd->flow_control)
-+ ti->c_cflag |= CRTSCTS;
-+ else
-+ ti->c_cflag &= ~CRTSCTS;
-+ if (tcsetattr(fd, TCSANOW, ti) < 0) {
-+ perror("Can't set port settings");
-+ return -1;
-+ }
-+
-+ u->speed = sercmd->baud;
-+
-+ tcflush(fd, TCIOFLUSH);
-+ if (set_speed(fd, ti, sercmd->baud) < 0) {
-+ perror("Can't set baud rate");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_DELAY) {
-+ action_delay_t *delay = (action_delay_t *)actionbuf;
-+ usleep(delay->msec); /* seems they give usec, not
msec */
-+ }
-+ else {
-+ fprintf( stderr, "BTS action type = %d: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+ }
-+ }
-+ bts_unload_script( bfp );
-+ return 0;
-+}
-+
- static int texas(int fd, struct uart_t *u, struct termios *ti)
- {
- struct timespec tm = {0, 50000};
-@@ -296,15 +407,26 @@
- } while (resp[4] != cmd[1] && resp[5] != cmd[2]);
-
- /* Verify manufacturer */
-- if ((resp[11] & 0xFF) != 0x0d)
-+ if (resp[11] != 0x0d)
- fprintf(stderr,"WARNING : module's manufacturer is not Texas
Instrument\n");
-
- /* Print LMP version */
-- fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF);
-+ fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]);
-
- /* Print LMP subversion */
-- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14]
& 0xFF, resp[13] & 0xFF);
-+ fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14],
resp[13]);
-+ if ((resp[14] >> 2) == 3) {
-+ int err;
-+ nanosleep(&tm, NULL);
-
-+ /* BRF6150 */
-+ if ((err=brf6150( fd, u, ti )) != 0) {
-+ fprintf( stderr, "TI script failed (err=%d)\n",
-+ err );
-+ return -1;
-+ }
-+ }
-+
- nanosleep(&tm, NULL);
- return 0;
- }
-@@ -1103,7 +1225,7 @@
- {
- printf("hciattach - HCI UART driver initialization utility\n");
- printf("Usage:\n");
-- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed]
<tty> <type | id> [speed] [flow|noflow]\n");
-+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S
bts-script] <tty> <type | id> [speed] [flow|noflow]\n");
- printf("\thciattach -l\n");
- }
-
-@@ -1118,11 +1240,12 @@
- struct sigaction sa;
- struct pollfd p;
- char dev[PATH_MAX];
-+ char *bts = NULL;
-
- detach = 1;
- printpid = 0;
-
-- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
-+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
- switch(opt) {
- case 'b':
- send_break = 1;
-@@ -1144,6 +1267,10 @@
- init_speed = atoi(optarg);
- break;
-
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
