From 6b728c4ad4bf63a79f51ee1318a19089f78ffb48 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 7 Sep 2007 09:04:17 +0000 Subject: bluez-utils: upgraded to 3.18 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2715 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/bluez/bluez-utils_3.17.bb | 107 -------------------------------- meta/packages/bluez/bluez-utils_3.18.bb | 107 ++++++++++++++++++++++++++++++++ meta/packages/bluez/bluez-utils_3.4.bb | 53 ---------------- 3 files changed, 107 insertions(+), 160 deletions(-) delete mode 100644 meta/packages/bluez/bluez-utils_3.17.bb create mode 100644 meta/packages/bluez/bluez-utils_3.18.bb delete mode 100644 meta/packages/bluez/bluez-utils_3.4.bb (limited to 'meta/packages') diff --git a/meta/packages/bluez/bluez-utils_3.17.bb b/meta/packages/bluez/bluez-utils_3.17.bb deleted file mode 100644 index 8fa75c34a..000000000 --- a/meta/packages/bluez/bluez-utils_3.17.bb +++ /dev/null @@ -1,107 +0,0 @@ -require bluez-utils.inc - -DEPENDS += "glib-2.0" -PR = "r1" - -# ti patch doesn't apply, people using it should rediff it and send it upstream -#SRC_URI += "file://hciattach-ti-bts.patch;patch=1 " - -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --disable-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 \ - ${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 \ - " - diff --git a/meta/packages/bluez/bluez-utils_3.18.bb b/meta/packages/bluez/bluez-utils_3.18.bb new file mode 100644 index 000000000..8fa75c34a --- /dev/null +++ b/meta/packages/bluez/bluez-utils_3.18.bb @@ -0,0 +1,107 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" +PR = "r1" + +# ti patch doesn't apply, people using it should rediff it and send it upstream +#SRC_URI += "file://hciattach-ti-bts.patch;patch=1 " + +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --disable-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 \ + ${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 \ + " + diff --git a/meta/packages/bluez/bluez-utils_3.4.bb b/meta/packages/bluez/bluez-utils_3.4.bb deleted file mode 100644 index 49e6ded25..000000000 --- a/meta/packages/bluez/bluez-utils_3.4.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} dbus" -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 = "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 -# 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 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/ - install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ -} - -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" -- cgit v1.2.3