From 29ab43535c95595889b29f1956ca2034cbc6d2d2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 1 Jul 2005 16:26:26 +0000 Subject: Bluez-Update: - update bluez-libs to 2.17 - update bluez-utils to 2.17 - fix base.patch against /etc/pcmcia/bluetooth to actually do something --- packages/bluez-libs/bluez-libs_2.16.bb | 20 ---------- packages/bluez-libs/bluez-libs_2.17.bb | 21 +++++++++++ packages/bluez-utils/bluez-utils-common_2.16.inc | 48 ------------------------ packages/bluez-utils/bluez-utils-common_2.17.inc | 48 ++++++++++++++++++++++++ packages/bluez-utils/bluez-utils-dbus_2.16.bb | 5 --- packages/bluez-utils/bluez-utils-dbus_2.17.bb | 5 +++ packages/bluez-utils/bluez-utils-nodbus_2.16.bb | 4 -- packages/bluez-utils/bluez-utils-nodbus_2.17.bb | 4 ++ packages/bluez-utils/files/base.patch | 19 +++++----- 9 files changed, 88 insertions(+), 86 deletions(-) delete mode 100644 packages/bluez-libs/bluez-libs_2.16.bb create mode 100644 packages/bluez-libs/bluez-libs_2.17.bb delete mode 100644 packages/bluez-utils/bluez-utils-common_2.16.inc create mode 100644 packages/bluez-utils/bluez-utils-common_2.17.inc delete mode 100644 packages/bluez-utils/bluez-utils-dbus_2.16.bb create mode 100644 packages/bluez-utils/bluez-utils-dbus_2.17.bb delete mode 100644 packages/bluez-utils/bluez-utils-nodbus_2.16.bb create mode 100644 packages/bluez-utils/bluez-utils-nodbus_2.17.bb diff --git a/packages/bluez-libs/bluez-libs_2.16.bb b/packages/bluez-libs/bluez-libs_2.16.bb deleted file mode 100644 index cf80d773e7..0000000000 --- a/packages/bluez-libs/bluez-libs_2.16.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" - -inherit autotools pkgconfig - -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hci_uart.h hci_vhci.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" - -do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done -} diff --git a/packages/bluez-libs/bluez-libs_2.17.bb b/packages/bluez-libs/bluez-libs_2.17.bb new file mode 100644 index 0000000000..7a5df4ebe4 --- /dev/null +++ b/packages/bluez-libs/bluez-libs_2.17.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" + +inherit autotools pkgconfig + +HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hci_uart.h hci_vhci.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" + +do_stage() { + oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/bluetooth/ + for f in ${HEADERS} + do + install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f + done +} diff --git a/packages/bluez-utils/bluez-utils-common_2.16.inc b/packages/bluez-utils/bluez-utils-common_2.16.inc deleted file mode 100644 index 69f9514695..0000000000 --- a/packages/bluez-utils/bluez-utils-common_2.16.inc +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} pcmcia-cs" -RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" -LICENSE = "GPL" -PR = "r2" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://base.patch;patch=1 \ - file://blueboxes.patch;patch=1 \ - file://hcid.conf \ - file://bluetooth.default \ - file://bluetooth.conf " - -# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol -# Let's default to that instead of 'any' and see if we break something with that -SRC_URI_append_familiar = " file://default-manfid-0x0-to-bcps.patch" -SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch" - -S = "${WORKDIR}/bluez-utils-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} \ - --enable-pcmcia --enable-initscripts" - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "bluetooth" -INITSCRIPT_PARAMS = "defaults 23 19" - -do_install_append() { - install -d ${D}${base_sbindir} ${D}${base_bindir}/ - 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 - chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth - install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ - install -m 0644 ${WORKDIR}/bluetooth.default ${D}${sysconfdir}/default/bluetooth - cat ${WORKDIR}/bluetooth.conf >> ${D}${sysconfdir}/pcmcia/bluetooth.conf -} - -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/bluetooth/pin ${sysconfdir}/default/bluetooth" - -PACKAGES =+ "${PN}-ciptool ${PN}-bluepin" -FILES_${PN}-ciptool = "/bin/ciptool" -FILES_${PN}-bluepin = "/bin/bluepin" diff --git a/packages/bluez-utils/bluez-utils-common_2.17.inc b/packages/bluez-utils/bluez-utils-common_2.17.inc new file mode 100644 index 0000000000..69f9514695 --- /dev/null +++ b/packages/bluez-utils/bluez-utils-common_2.17.inc @@ -0,0 +1,48 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs-${PV} pcmcia-cs" +RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" +LICENSE = "GPL" +PR = "r2" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://base.patch;patch=1 \ + file://blueboxes.patch;patch=1 \ + file://hcid.conf \ + file://bluetooth.default \ + file://bluetooth.conf " + +# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol +# Let's default to that instead of 'any' and see if we break something with that +SRC_URI_append_familiar = " file://default-manfid-0x0-to-bcps.patch" +SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch" + +S = "${WORKDIR}/bluez-utils-${PV}" + +EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} \ + --enable-pcmcia --enable-initscripts" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + +do_install_append() { + install -d ${D}${base_sbindir} ${D}${base_bindir}/ + 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 + chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth + install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ + install -m 0644 ${WORKDIR}/bluetooth.default ${D}${sysconfdir}/default/bluetooth + cat ${WORKDIR}/bluetooth.conf >> ${D}${sysconfdir}/pcmcia/bluetooth.conf +} + +CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ + ${sysconfdir}/bluetooth/pin ${sysconfdir}/default/bluetooth" + +PACKAGES =+ "${PN}-ciptool ${PN}-bluepin" +FILES_${PN}-ciptool = "/bin/ciptool" +FILES_${PN}-bluepin = "/bin/bluepin" diff --git a/packages/bluez-utils/bluez-utils-dbus_2.16.bb b/packages/bluez-utils/bluez-utils-dbus_2.16.bb deleted file mode 100644 index f405cd5133..0000000000 --- a/packages/bluez-utils/bluez-utils-dbus_2.16.bb +++ /dev/null @@ -1,5 +0,0 @@ -include bluez-utils-common_${PV}.inc -DEPENDS += "dbus" -SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1" -EXTRA_OECONF += "--with-dbus" - diff --git a/packages/bluez-utils/bluez-utils-dbus_2.17.bb b/packages/bluez-utils/bluez-utils-dbus_2.17.bb new file mode 100644 index 0000000000..f405cd5133 --- /dev/null +++ b/packages/bluez-utils/bluez-utils-dbus_2.17.bb @@ -0,0 +1,5 @@ +include bluez-utils-common_${PV}.inc +DEPENDS += "dbus" +SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1" +EXTRA_OECONF += "--with-dbus" + diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.16.bb b/packages/bluez-utils/bluez-utils-nodbus_2.16.bb deleted file mode 100644 index 6334a4a499..0000000000 --- a/packages/bluez-utils/bluez-utils-nodbus_2.16.bb +++ /dev/null @@ -1,4 +0,0 @@ -include bluez-utils-common_${PV}.inc - -EXTRA_OECONF += "--without-dbus" - diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.17.bb b/packages/bluez-utils/bluez-utils-nodbus_2.17.bb new file mode 100644 index 0000000000..6334a4a499 --- /dev/null +++ b/packages/bluez-utils/bluez-utils-nodbus_2.17.bb @@ -0,0 +1,4 @@ +include bluez-utils-common_${PV}.inc + +EXTRA_OECONF += "--without-dbus" + diff --git a/packages/bluez-utils/files/base.patch b/packages/bluez-utils/files/base.patch index dbbff5199c..c4bb288303 100644 --- a/packages/bluez-utils/files/base.patch +++ b/packages/bluez-utils/files/base.patch @@ -3,19 +3,20 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- bluez-utils-2.14/pcmcia/bluetooth~base -+++ bluez-utils-2.14/pcmcia/bluetooth -@@ -15,6 +15,9 @@ - - if [ -r ./shared ]; then . ./shared ; else . /etc/pcmcia/shared ; fi +--- bluez-utils-2.17/pcmcia/bluetooth~base.patch ++++ bluez-utils-2.17/pcmcia/bluetooth +@@ -18,6 +18,10 @@ + # Get device attributes + get_info $DEVICE +test "$DEVICE" = "ttyS7" && DEVICE="/dev/tts/7" +test -z "$MANFID" && MANFID="bcsp" ++test "$MANFID" = "0000,0000" && MANFID="bcsp" + - # Get device attributes - get_info $DEVICE - -@@ -25,7 +28,7 @@ + # + # Serial devices + # +@@ -25,7 +29,7 @@ IRQ=`setserial /dev/$DEVICE | sed -e 's/.*IRQ: //'` setserial /dev/$DEVICE irq 0 ; setserial /dev/$DEVICE irq $IRQ -- cgit v1.2.3