diff options
Diffstat (limited to 'packages/bluez')
29 files changed, 765 insertions, 111 deletions
diff --git a/packages/bluez/files/openzaurus/.mtn2git_empty b/packages/bluez/bcm2035-tool/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/bluez/files/openzaurus/.mtn2git_empty +++ b/packages/bluez/bcm2035-tool/.mtn2git_empty diff --git a/packages/bluez/bcm2035-tool/addr-as-arg.patch b/packages/bluez/bcm2035-tool/addr-as-arg.patch new file mode 100644 index 0000000000..28618c5bbb --- /dev/null +++ b/packages/bluez/bcm2035-tool/addr-as-arg.patch @@ -0,0 +1,104 @@ +--- bcm2035-tool/bcm2035-tool.c 2007/05/07 12:48:06 2000 ++++ bcm2035-tool/bcm2035-tool.c 2007/05/07 12:55:47 2001 +@@ -1,6 +1,8 @@ +-/* bcm2035-tool - bcm2035 tool for Motorola EZX phones ++/* bcm2035-tool + * + * (C) 2007 by Daniel Ribeiro <drwyrm@gmail.com> ++ * ++ * MAC address as argument extension by: Jan Herman <2hp@seznam.cz> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 +@@ -17,10 +19,10 @@ + * + */ + ++/* Default MAC address */ ++#define BDADDR "\x06\x05\x04\x03\x02\x01" + + //#define PATCH_FIRMWARE +-#define BDADDR "\xab\x89\x67\x45\x23\x01" +- + + #include <stdio.h> + #include <string.h> +@@ -33,6 +35,7 @@ + #include <sys/ioctl.h> + #include <termios.h> + #include "bcm2035-tool.h" ++//#include "bluetooth.h" + + #ifdef PATCH_FIRMWARE + #include "motorola_patches.h" +@@ -180,18 +183,51 @@ + + } + ++void mac2hex(const char *mac, u_char *dst) ++{ ++ ++ int i; ++ long l; ++ char *pp; ++ ++ while (isspace(*mac)) ++ mac++; ++ ++ /* expect 6 hex octets separated by ':' or space/NUL if last octet */ ++ for (i = 0; i < 6; i++) { ++ l = strtol(mac, &pp, 16); ++ if (pp == mac || l > 0xFF || l < 0) ++ return; ++ if (!(*pp == ':' || (i == 5 && (isspace(*pp) || *pp == '\0')))) ++ return; ++ /* 5-i swaps hex chars */ ++ dst[5-i] = (u_char) l; ++ mac = pp + 1; ++ } ++ } ++ ++char bdaddr[6]; ++ + int main(int argc, char **argv) + { + int fd, i; + struct termios term; + char buf[1024]; +- char bdaddr[6]; +- +- if (argc < 2) { +- printf("use: %s <device>\n", argv[0]); ++ ++ if (argc < 3) { ++ printf("BCM2035 Tool:\n"); ++ printf("Usage: %s <device> <bdaddr>\n", argv[0]); + exit(1); + } + ++ if (strlen(argv[2]) < 17) { ++ printf("invalid argument %s!\n", argv[2]); ++ exit(1); ++ } ++ ++ /* Converts MAC address to swapped HEX */ ++ mac2hex(argv[2], bdaddr); ++ + fd = open (argv[1], O_RDWR | O_NOCTTY ); + + if(fd < 0) exit(-1); +@@ -212,7 +248,7 @@ + #endif + set_baud(fd, 460800); + +- send_cmd(fd, CMD_SET_BDADDR, BDADDR, 6); ++ send_cmd(fd, CMD_SET_BDADDR, bdaddr, 6); + + i = N_HCI; + if (ioctl(fd, TIOCSETD, &i) < 0) { +@@ -228,5 +264,3 @@ + while (1) sleep(999999999); + return 0; + } +- +- diff --git a/packages/bluez/bcm2035-tool_0.0.bb b/packages/bluez/bcm2035-tool_0.0.bb new file mode 100644 index 0000000000..636841de6f --- /dev/null +++ b/packages/bluez/bcm2035-tool_0.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Bluetooth firmware poker for bccm2035 chips (motorola phones and palms)" +LICENSE = "GPLv2" + +PR = "r1" + +SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz \ + file://addr-as-arg.patch;patch=1 \ + " + +S = "${WORKDIR}/${PN}" + +do_compile() { + ${CC} bcm2035-tool.c -o bcm2035-tool +} + +do_install() { + install -d ${D}${sbindir} + install -m 755 bcm2035-tool ${D}${sbindir} +} diff --git a/packages/bluez/bluez-dtl1-workaround_1.0.bb b/packages/bluez/bluez-dtl1-workaround_1.0.bb new file mode 100644 index 0000000000..413d220508 --- /dev/null +++ b/packages/bluez/bluez-dtl1-workaround_1.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A nasty hack for for dtl1-cs driver to workaround suspend/resume." +SECTION = "console" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "file://02dtl1_cs.sh" + +do_install() { + install -d ${D}${sysconfdir}/apm/event.d/ + install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ +} + +#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume +FILES_${PN} += "${sysconfdir}/apm/" + +PACKAGE_ARCH = "all" diff --git a/packages/bluez/bluez-gnome_0.10.bb b/packages/bluez/bluez-gnome_0.10.bb new file mode 100644 index 0000000000..d50e8e5fde --- /dev/null +++ b/packages/bluez/bluez-gnome_0.10.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEPENDS = "dbus-glib gconf libnotify gtk+" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-gnome_0.6.bb b/packages/bluez/bluez-gnome_0.6.bb index 481a383019..d50e8e5fde 100644 --- a/packages/bluez/bluez-gnome_0.6.bb +++ b/packages/bluez/bluez-gnome_0.6.bb @@ -1,10 +1,11 @@ DESCRIPTION = "BLuetooth configuration applet" LICENSE = "GPL+LGPL" -DEPENDS = "bluez-libs dbus-glib gconf libnotify gtk+ openobex" +DEPENDS = "dbus-glib gconf libnotify gtk+" SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" -inherit autotools pkgconfig +inherit autotools pkgconfig gconf +FILES_${PN} += "${datadir}/gconf" diff --git a/packages/bluez/bluez-gnome_0.7.bb b/packages/bluez/bluez-gnome_0.7.bb new file mode 100644 index 0000000000..d50e8e5fde --- /dev/null +++ b/packages/bluez/bluez-gnome_0.7.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEPENDS = "dbus-glib gconf libnotify gtk+" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-gnome_0.9.bb b/packages/bluez/bluez-gnome_0.9.bb new file mode 100644 index 0000000000..d50e8e5fde --- /dev/null +++ b/packages/bluez/bluez-gnome_0.9.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEPENDS = "dbus-glib gconf libnotify gtk+" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_cvs.bb new file mode 100644 index 0000000000..ea5bbe6c2f --- /dev/null +++ b/packages/bluez/bluez-gnome_cvs.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEFAULT_PREFERENCE = "-1" + +DEPENDS = "dbus-glib gconf libnotify gtk+" + +SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome \ + " + +PV = "0.10+cvs${SRCDATE}" +S = "${WORKDIR}/gnome" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-gnome_git.bb b/packages/bluez/bluez-gnome_git.bb new file mode 100644 index 0000000000..e16fee109d --- /dev/null +++ b/packages/bluez/bluez-gnome_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEFAULT_PREFERENCE = "-2" + +DEPENDS = "dbus-glib gconf libnotify gtk+" + +SRC_URI = "git://people.freedesktop.org/~hadess/bluez-gnome;protocol=git \ + file://pkgconfig-add-gthread.patch;patch=1 " + +PV = "0.10+git${SRCDATE}" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-hcidump_1.37.bb b/packages/bluez/bluez-hcidump_1.37.bb new file mode 100644 index 0000000000..877c8db33c --- /dev/null +++ b/packages/bluez/bluez-hcidump_1.37.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/packages/bluez/bluez-hcidump_1.38.bb b/packages/bluez/bluez-hcidump_1.38.bb new file mode 100644 index 0000000000..877c8db33c --- /dev/null +++ b/packages/bluez/bluez-hcidump_1.38.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/packages/bluez/bluez-libs_3.10.bb b/packages/bluez/bluez-libs_3.10.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.10.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.11.bb b/packages/bluez/bluez-libs_3.11.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.11.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.12.bb b/packages/bluez/bluez-libs_3.12.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.12.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.13.bb b/packages/bluez/bluez-libs_3.13.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.13.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index a22431eaf9..097b8eba13 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." SECTION = "console" PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} dbus" +DEPENDS = "bluez-libs-${PV} libusb dbus cups" PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" RREPLACES = "bluez-utils-dbus" @@ -10,9 +10,8 @@ LICENSE = "GPL" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ - file://02dtl1_cs.sh \ file://hciattach-ti-bts.patch;patch=1 \ - file://handle-eintr.patch;patch=1" + file://handle-eintr.patch;patch=1;status=applied" # 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... @@ -20,7 +19,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" S = "${WORKDIR}/bluez-utils-${PV}" -EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci" +EXTRA_OECONF = "--enable-initscripts --enable-bccmd --enable-bcm203x --enable-hid2hci --enable-cups" # --enable-obex enable OBEX support # --enable-alsa enable ALSA support # --enable-cups install CUPS backend support @@ -41,14 +40,16 @@ do_install_append() { 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/ - install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ } CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ ${sysconfdir}/default/bluetooth" -PACKAGES =+ "${PN}-ciptool" -FILES_${PN}-ciptool = "/bin/ciptool" -RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" -RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" +PACKAGES =+ " bluez-cups-backend" + +FILES_${PN} += " ${libdir}/alsa-lib/*.so " +FILES_${PN}-dev += " ${libdir}/alsa-lib/*.la " + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" diff --git a/packages/bluez/bluez-utils/02dtl1_cs.sh b/packages/bluez/bluez-utils/02dtl1_cs.sh deleted file mode 100644 index fd81508010..0000000000 --- a/packages/bluez/bluez-utils/02dtl1_cs.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -case "$1" in - suspend) - if [ "`/bin/hciconfig`" != "" ]; then - #If hciconfig outputs anything then there's probably a Bluetooth - # CF card in the slot so shut it down. - hcitool dc `hcitool con | grep ACL | sed 's/^.*\([0-9A-F]\{2\}\(:[0-9A-F]\{2\}\)\{5\}\).*$/\1/'` - hciconfig hci0 down - killall hciattach > /dev/null 2>&1 - fi - ;; - - resume) - #check for kernel version - if [ "`uname -r | grep 2.4.`" != "" ]; then - k="o" - elif [ "`uname -r | grep 2.6.`" != "" ]; then - k="ko" - else - exit 0 - fi - - if test -e /sbin/cardctl; then - CARDCTL=/sbin/cardctl - elif test -e /sbin/pccardctl; then - CARDCTL=/sbin/pccardctl - else - exit 0 - fi - - if [ "`lsmod | grep hci_uart`" != "" ]; then - #If the hci_usb module is still loaded then there's a serial based - # Bluetooth CF card in the slot, which only needs a resume to get it going - # again. - rfcomm bind all - $CARDCTL resume - hciconfig hci0 up - else - # only works for nokia dtl1 cards - for f in /lib/modules/`uname -r`/kernel/drivers/bluetooth/dtl1_cs.$k - do - #Enumerate all the self-contained Bluetooth CF card drivers - f=`echo $f | sed 's/\.'$k'$//'` - f=`basename $f` - if [ "`lsmod | grep $f`" != "" ]; then - #If one of these drivers is still loaded, then there is probably - #a non-serial based Bluetooth CF card in the slot that needs - #ejecting and reinserting to get it going again - rfcomm bind all - $CARDCTL eject - $CARDCTL insert - hciconfig hci0 up - fi - done - fi -esac 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.11.bb b/packages/bluez/bluez-utils_3.11.bb new file mode 100644 index 0000000000..6cadfc1a53 --- /dev/null +++ b/packages/bluez/bluez-utils_3.11.bb @@ -0,0 +1,111 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" + +#DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + " +PR = "r1" + +EXTRA_OECONF = " \ + --enable-bccmd \ + --disable-hid2hci \ + --disable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +# The config options are explained below: + +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +# --enable-glib For systems that use and install GLib anyway +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server + +#Following services can be enabled so far: +# --enable-network +# --enable-serial +# --enable-input +# --enable-audio +# --enable-echo + +#There is no need to modify any init script. They will be started +#automatically or on demand. Only /etc/bluetooth/*.service files should +#be patched to change name or the autostart value. +# --enable-configfile +# --enable-initscripts + +#For even smaller -doc packages +# --disable-manpages +# --disable-pcmciarules + +#I haven't seen any embedded device with HID proxy support. So simply +#disable it: +# --disable-hid2hci + + +PACKAGES =+ "${PN}-compat" + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/*.service \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/.debug \ + " + +FILES_${PN}-compat = " \ + ${base_bindir}/sdptool \ + ${base_bindir}/dund \ + ${base_bindir}/rctest \ + ${base_bindir}/ciptool \ + ${base_bindir}/l2test \ + ${base_bindir}/rfcomm \ + ${base_bindir}/hcitool \ + ${base_bindir}/pand \ + ${base_bindir}/hidd \ + ${base_bindir}/l2ping \ + ${base_sbindir}/hciconfig \ + ${base_sbindir}/bccmd \ + ${base_sbindir}/hciemu \ + ${base_bindir}/passkey-agent \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" + + diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb new file mode 100644 index 0000000000..754097acce --- /dev/null +++ b/packages/bluez/bluez-utils_3.12.bb @@ -0,0 +1,114 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + " +PR = "r4" + +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +# The config options are explained below: + +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +# --enable-glib For systems that use and install GLib anyway +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server + +#Following services can be enabled so far: +# --enable-network +# --enable-serial +# --enable-input +# --enable-audio +# --enable-echo + +#There is no need to modify any init script. They will be started +#automatically or on demand. Only /etc/bluetooth/*.service files should +#be patched to change name or the autostart value. +# --enable-configfile +# --enable-initscripts + +#For even smaller -doc packages +# --disable-manpages +# --disable-pcmciarules + +#I haven't seen any embedded device with HID proxy support. So simply +#disable it: +# --disable-hid2hci + + +PACKAGES =+ "${PN}-compat ${PN}-alsa" + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/*.service \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/.debug \ + ${libdir}/cups/backend/.debug \ + ${libdir}/alsa-lib/.debug \ + " + +FILES_${PN}-compat = " \ + ${base_bindir}/sdptool \ + ${base_bindir}/dund \ + ${base_bindir}/rctest \ + ${base_bindir}/ciptool \ + ${base_bindir}/l2test \ + ${base_bindir}/rfcomm \ + ${base_bindir}/hcitool \ + ${base_bindir}/pand \ + ${base_bindir}/hidd \ + ${base_bindir}/l2ping \ + ${base_sbindir}/hciconfig \ + ${base_sbindir}/bccmd \ + ${base_sbindir}/hciemu \ + ${base_sbindir}/hid2hci \ + ${base_bindir}/passkey-agent \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" + + diff --git a/packages/bluez/bluez-utils_3.13.bb b/packages/bluez/bluez-utils_3.13.bb new file mode 100644 index 0000000000..5ea1429641 --- /dev/null +++ b/packages/bluez/bluez-utils_3.13.bb @@ -0,0 +1,114 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + " +PR = "r0" + +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +# The config options are explained below: + +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +# --enable-glib For systems that use and install GLib anyway +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server + +#Following services can be enabled so far: +# --enable-network +# --enable-serial +# --enable-input +# --enable-audio +# --enable-echo + +#There is no need to modify any init script. They will be started +#automatically or on demand. Only /etc/bluetooth/*.service files should +#be patched to change name or the autostart value. +# --enable-configfile +# --enable-initscripts + +#For even smaller -doc packages +# --disable-manpages +# --disable-pcmciarules + +#I haven't seen any embedded device with HID proxy support. So simply +#disable it: +# --disable-hid2hci + + +PACKAGES =+ "${PN}-compat ${PN}-alsa" + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/*.service \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/.debug \ + ${libdir}/cups/backend/.debug \ + ${libdir}/alsa-lib/.debug \ + " + +FILES_${PN}-compat = " \ + ${base_bindir}/sdptool \ + ${base_bindir}/dund \ + ${base_bindir}/rctest \ + ${base_bindir}/ciptool \ + ${base_bindir}/l2test \ + ${base_bindir}/rfcomm \ + ${base_bindir}/hcitool \ + ${base_bindir}/pand \ + ${base_bindir}/hidd \ + ${base_bindir}/l2ping \ + ${base_sbindir}/hciconfig \ + ${base_sbindir}/bccmd \ + ${base_sbindir}/hciemu \ + ${base_sbindir}/hid2hci \ + ${base_bindir}/passkey-agent \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" + + diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb index 49e6ded250..f2bbd15507 100644 --- a/packages/bluez/bluez-utils_3.4.bb +++ b/packages/bluez/bluez-utils_3.4.bb @@ -11,7 +11,6 @@ PR = "r1" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ - file://02dtl1_cs.sh \ file://hciattach-ti-bts.patch;patch=1" # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol @@ -41,7 +40,6 @@ do_install_append() { 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/ - install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ } CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ diff --git a/packages/bluez/bluez-utils_3.7.bb b/packages/bluez/bluez-utils_3.7.bb new file mode 100644 index 0000000000..7a76cb3200 --- /dev/null +++ b/packages/bluez/bluez-utils_3.7.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs-${PV} dbus cups alsa-lib openobex" +PROVIDES = "bluez-utils-dbus" +RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" +RREPLACES = "bluez-utils-dbus" +RCONFLICTS_${PN} = "bluez-utils-nodbus" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + file://hciattach-ti-bts.patch;patch=1" + +# 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}" + +EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-obex --enable-alsa --enable-cups" +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +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/ +} + +CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ + ${sysconfdir}/default/bluetooth" + +PACKAGES =+ "${PN}-ciptool bluez-cups-backend" +FILES_${PN}-ciptool = "/bin/ciptool" +RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" +RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" diff --git a/packages/bluez/bluez-utils_3.8.bb b/packages/bluez/bluez-utils_3.8.bb index d549d12d30..f2bbd15507 100644 --- a/packages/bluez/bluez-utils_3.8.bb +++ b/packages/bluez/bluez-utils_3.8.bb @@ -7,11 +7,10 @@ RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" RREPLACES = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ - file://02dtl1_cs.sh \ file://hciattach-ti-bts.patch;patch=1" # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol @@ -41,7 +40,6 @@ do_install_append() { 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/ - install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ } CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb index 36410ee2ec..29c472fbbd 100644 --- a/packages/bluez/bluez-utils_3.9.bb +++ b/packages/bluez/bluez-utils_3.9.bb @@ -1,3 +1,13 @@ require bluez-utils.inc -PR = "r2" +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 = "r5" diff --git a/packages/bluez/files/openzaurus/bluetooth.default b/packages/bluez/files/openzaurus/bluetooth.default deleted file mode 100644 index e63ab137cc..0000000000 --- a/packages/bluez/files/openzaurus/bluetooth.default +++ /dev/null @@ -1,37 +0,0 @@ -# Bluetooth configuraton file - -# Start of hcid (allowed values are "true" and "false") -HCID_ENABLE=true - -# Config file for hcid -HCID_CONFIG="/etc/bluetooth/hcid.conf" - -# Start sdpd (allowed values are "true" and "false") -SDPD_ENABLE=true - -# Start hidd (allowed values are "true" and "false") -HIDD_ENABLE=false - -# Arguments to hidd -HIDD_OPTIONS="" - -# Run hid2hci (allowed values are "true" and "false") -HID2HCI_ENABLE=true - -# Bind rfcomm devices (allowed values are "true" and "false") -RFCOMM_ENABLE=true - -# Config file for rfcomm -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -# Start dund (allowed values are "true" and "false") -DUND_ENABLE=false - -# Arguments to dund -DUND_OPTIONS="--listen --persist" - -# Start pand (allowed values are "true" and "false") -PAND_ENABLE=false - -# Arguments to pand -PAND_OPTIONS="--listen --role NAP" diff --git a/packages/bluez/files/pkgconfig-add-gthread.patch b/packages/bluez/files/pkgconfig-add-gthread.patch new file mode 100644 index 0000000000..2dde6b81f5 --- /dev/null +++ b/packages/bluez/files/pkgconfig-add-gthread.patch @@ -0,0 +1,50 @@ +Index: git/configure.in +=================================================================== +--- git.orig/configure.in 2007-07-17 17:25:52.000000000 +0100 ++++ git/configure.in 2007-07-17 17:25:52.000000000 +0100 +@@ -75,6 +75,10 @@ + AC_SUBST(OPENOBEX_CFLAGS) + AC_SUBST(OPENOBEX_LIBS) + ++PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.10, dummy=yes, dummy=no) ++AC_SUBST(GTHREAD_CFLAGS) ++AC_SUBST(GTHREAD_LIBS) ++ + AC_ARG_BLUEZ + + AC_OUTPUT(Makefile compat/Makefile common/Makefile applet/Makefile properties/Makefile sendto/Makefile wizard/Makefile proximity/Makefile po/Makefile.in) +Index: git/applet/Makefile.am +=================================================================== +--- git.orig/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100 ++++ git/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100 +@@ -4,12 +4,12 @@ + bluetooth_applet_SOURCES = main.c + + bluetooth_applet_LDADD = $(top_builddir)/compat/libcompat.a $(top_builddir)/common/libcommon.a \ +- @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ ++ @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@ + + nodist_bluetooth_applet_SOURCES = $(top_builddir)/common/passkey-agent-glue.h \ + $(top_builddir)/common/auth-agent-glue.h + +-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\" ++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ @GTHREAD_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\" + + INCLUDES = -I$(top_builddir)/common -I$(top_srcdir)/compat + +Index: git/properties/Makefile.am +=================================================================== +--- git.orig/properties/Makefile.am 2007-07-17 17:28:11.000000000 +0100 ++++ git/properties/Makefile.am 2007-07-17 17:28:44.000000000 +0100 +@@ -4,9 +4,9 @@ + bluetooth_properties_SOURCES = main.c + + bluetooth_properties_LDADD = $(top_builddir)/common/libcommon.a \ +- @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ ++ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@ + +-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ ++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @GTHREAD_CFLAGS@ + + INCLUDES = -I$(top_srcdir)/common + |