Patchwork [V2] bluez4: Added new recipe 4.96 and removed 4.82 version

login
register
mail settings
Submitter Noor Ahsan
Date Aug. 12, 2011, 8:04 a.m.
Message ID <1313136251-32214-1-git-send-email-noor_ahsan@mentor.com>
Download mbox | patch
Permalink /patch/9753/
State New, archived
Headers show

Comments

Noor Ahsan - Aug. 12, 2011, 8:04 a.m.
From: Noor Ahsan <noor_ahsan@mentor.com>

* Added new recipe 4.96 and removed 4.82 version and its files.


Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
---
 .../bluez/bluez4-4.82/bluetooth.conf               |   16 ----
 .../fix-dfutool-usb-declaration-mismatch.patch     |   20 -----
 .../bluez/bluez4-4.82/hid2hci_usb_init.patch       |   35 ---------
 .../bluez/bluez4-4.82/sbc-thumb.patch              |   14 ----
 .../bluez/bluez4-4.96/bluetooth.conf               |   16 ++++
 meta/recipes-connectivity/bluez/bluez4_4.82.bb     |   75 --------------------
 meta/recipes-connectivity/bluez/bluez4_4.96.bb     |   73 +++++++++++++++++++
 7 files changed, 89 insertions(+), 160 deletions(-)
Saul Wold - Aug. 15, 2011, 5:02 p.m.
On 08/12/2011 01:04 AM, Noor, Ahsan wrote:
> From: Noor Ahsan<noor_ahsan@mentor.com>
>
> * Added new recipe 4.96 and removed 4.82 version and its files.
>
>
> Signed-off-by: Noor Ahsan<noor_ahsan@mentor.com>
> ---
>   .../bluez/bluez4-4.82/bluetooth.conf               |   16 ----
>   .../fix-dfutool-usb-declaration-mismatch.patch     |   20 -----
>   .../bluez/bluez4-4.82/hid2hci_usb_init.patch       |   35 ---------
>   .../bluez/bluez4-4.82/sbc-thumb.patch              |   14 ----
>   .../bluez/bluez4-4.96/bluetooth.conf               |   16 ++++
>   meta/recipes-connectivity/bluez/bluez4_4.82.bb     |   75 --------------------
>   meta/recipes-connectivity/bluez/bluez4_4.96.bb     |   73 +++++++++++++++++++
>   7 files changed, 89 insertions(+), 160 deletions(-)
>
> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
> deleted file mode 100644
> index ca5e9e4..0000000
> --- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -<!-- This configuration file specifies the required security policies
> -     for Bluetooth core daemon to work. -->
> -
> -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> -<busconfig>
> -
> -<!-- ../system.conf have denied everything, so we just punch some holes -->
> -
> -<policy context="default">
> -<allow own="org.bluez"/>
> -<allow send_destination="org.bluez"/>
> -<allow send_interface="org.bluez.Agent"/>
> -</policy>
> -
> -</busconfig>
> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
> deleted file mode 100644
> index 27dead0..0000000
> --- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -# bluez4: add compile patch fixing some usb declaration mismatch
> -# Author: Michael 'Mickey' Lauer<mickey@vanille-media.de>
> -# Date:   Thu Jan 29 16:52:21 2009 +0000
> -#
> -# Acquired from OpenEmbedded
> -Upstream-Status: Pending
> -
> -Index: bluez-4.27/tools/dfutool.c
> -===================================================================
> ---- bluez-4.27.orig/tools/dfutool.c
> -+++ bluez-4.27/tools/dfutool.c
> -@@ -59,7 +59,7 @@
> - #endif
> -
> - #ifdef NEED_USB_GET_BUSSES
> --static inline struct usb_bus *usb_get_busses(void)
> -+inline struct usb_bus *usb_get_busses(void)
> - {
> - 	return usb_busses;
> - }
> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
> deleted file mode 100644
> index e8a58e5..0000000
> --- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -# Signed-off-by: Khem Raj<raj.khem@gmail.com>
> -#
> -# Use the new usb1 API for usb_init() and check for fails from
> -# usb_init (). Currently we see a crash on a system which does
> -# not have USB because usb_init() fails and it cleans up all initialized
> -# data (e.g. ctx) which is used in subsequent calls to libusb
> -# We return immediately if usb_init() fails for some reason.
> -
> -Upstream-Status: Inappropriate [not used]
> -
> -Index: bluez-4.24/tools/hid2hci.c
> -===================================================================
> ---- bluez-4.24.orig/tools/hid2hci.c	2008-10-25 23:40:34.000000000 -0700
> -+++ bluez-4.24/tools/hid2hci.c	2008-12-29 22:06:04.000000000 -0800
> -@@ -337,7 +337,7 @@
> - int main(int argc, char *argv[])
> - {
> - 	struct device_info dev[16];
> --	int i, opt, num, quiet = 0, mode = HCI;
> -+	int i, ret, opt, num, quiet = 0, mode = HCI;
> -
> - 	while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
> - 		switch (opt) {
> -@@ -361,8 +361,9 @@
> - 	argc -= optind;
> - 	argv += optind;
> - 	optind = 0;
> --
> --	usb_init();
> -+	ret = libusb_init();
> -+	if (ret<  0)
> -+		return ret;
> -
> - 	num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
> - 	if (num<= 0) {
> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
> deleted file mode 100644
> index 881cb9c..0000000
> --- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -# Acquired from OpenEmbedded
> -Upstream-Status: Inappropriate [embedded specific]
> -
> ---- bluez/sbc/sbc_math.h~	2008-03-05 20:18:03.000000000 +0000
> -+++ bluez/sbc/sbc_math.h	2008-10-27 13:39:27.000000000 +0000
> -@@ -59,7 +59,7 @@
> -
> - #define SBC_FIXED_0(val) { val = 0; }
> - #define MUL(a, b)        ((a) * (b))
> --#ifdef __arm__
> -+#if defined(__arm__)&&  !defined(__thumb__)
> - #define MULA(a, b, res) ({				\
> - 		int tmp = res;			\
> - 		__asm__(				\
> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
> new file mode 100644
> index 0000000..ca5e9e4
> --- /dev/null
> +++ b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
> @@ -0,0 +1,16 @@
> +<!-- This configuration file specifies the required security policies
> +     for Bluetooth core daemon to work. -->
> +
> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
> + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> +<busconfig>
> +
> +<!-- ../system.conf have denied everything, so we just punch some holes -->
> +
> +<policy context="default">
> +<allow own="org.bluez"/>
> +<allow send_destination="org.bluez"/>
> +<allow send_interface="org.bluez.Agent"/>
> +</policy>
> +
> +</busconfig>
> diff --git a/meta/recipes-connectivity/bluez/bluez4_4.82.bb b/meta/recipes-connectivity/bluez/bluez4_4.82.bb
> deleted file mode 100644
> index 9895006..0000000
> --- a/meta/recipes-connectivity/bluez/bluez4_4.82.bb
> +++ /dev/null
> @@ -1,75 +0,0 @@
> -SUMMARY = "Linux Bluetooth Stack Userland V4"
> -DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These include a system configurations, daemons, tools and system libraries."
> -HOMEPAGE = "http://www.bluez.org"
> -SECTION = "libs"
> -LICENSE = "GPLv2+&  LGPLv2.1+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> -                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
> -                    file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
> -                    file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
> -DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
> -RDEPENDS_${PN}-dev = "bluez-hcidump"
> -
> -# For angstrom we want this to replace at least bluez-libs
> -PROVIDES_append_angstrom = " bluez-utils bluez-libs"
> -
> -ASNEEDED = ""
> -
> -PR = "r0"
> -
> -SRC_URI = "\
> -  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
> -  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
> -  file://sbc-thumb.patch;patch=1 \
> -  file://bluetooth.conf \
> -"
> -
> -SRC_URI[md5sum] = "b9e5de607e5e43c868c35c68fe6f189f"
> -SRC_URI[sha256sum] = "75dc506f5346e1eb803f44294ae02406e806e309d9c9bda1de7ed235ff794b6d"
> -S = "${WORKDIR}/bluez-${PV}"
> -
> -inherit autotools
> -
> -EXTRA_OECONF = "\
> -  --enable-gstreamer \
> -  --enable-alsa \
> -  --enable-usb \
> -  --enable-netlink \
> -  --enable-tools \
> -  --enable-bccmd \
> -  --enable-hid2hci \
> -  --enable-dfutool \
> -  --enable-hidd \
> -  --enable-pandd \
> -  --enable-dund \
> -  --disable-cups \
> -  --enable-test \
> -  --enable-manpages \
> -  --enable-configfiles \
> -  --enable-initscripts \
> -  --disable-pcmciarules \
> -"
> -
> -do_install_append() {
> -	install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
> -	install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
> -	install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
> -	# at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
> -	install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
> -}
> -
> -PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
> -
> -FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
> -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
> -FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
> -FILES_${PN}-dev += "\
> -  ${libdir}/bluetooth/plugins/*.la \
> -  ${libdir}/alsa-lib/*.la \
> -  ${libdir}/gstreamer-0.10/*.la \
> -"
> -
> -FILES_${PN}-dbg += "\
> -  ${libdir}/bluetooth/plugins/.debug \
> -  ${libdir}/*/.debug \
> -"
> diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
> new file mode 100644
> index 0000000..ebd2849
> --- /dev/null
> +++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
> @@ -0,0 +1,73 @@
> +SUMMARY = "Linux Bluetooth Stack Userland V4"
> +DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These include a system configurations, daemons, tools and system libraries."
> +HOMEPAGE = "http://www.bluez.org"
> +SECTION = "libs"
> +LICENSE = "GPLv2+&  LGPLv2.1+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> +                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
> +                    file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
> +                    file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
> +DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
> +RDEPENDS_${PN}-dev = "bluez-hcidump"
> +
> +# For angstrom we want this to replace at least bluez-libs
> +PROVIDES_append_angstrom = " bluez-utils bluez-libs"
> +
> +ASNEEDED = ""
> +
> +PR = "r0"
> +
> +SRC_URI = "\
> +  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
> +  file://bluetooth.conf \
> +"
> +
> +SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
> +SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
> +S = "${WORKDIR}/bluez-${PV}"
> +
> +inherit autotools
> +
> +EXTRA_OECONF = "\
> +  --enable-gstreamer \
> +  --enable-alsa \
> +  --enable-usb \
> +  --enable-netlink \
> +  --enable-tools \
> +  --enable-bccmd \
> +  --enable-hid2hci \
> +  --enable-dfutool \
> +  --enable-hidd \
> +  --enable-pandd \
> +  --enable-dund \
> +  --disable-cups \
> +  --enable-test \
> +  --enable-manpages \
> +  --enable-configfiles \
> +  --enable-initscripts \
> +  --disable-pcmciarules \
> +"
> +
> +do_install_append() {
> +	install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
> +	install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
> +	install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
> +	# at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
> +	install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
> +}
> +
> +PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
> +
> +FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
> +FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
> +FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
> +FILES_${PN}-dev += "\
> +  ${libdir}/bluetooth/plugins/*.la \
> +  ${libdir}/alsa-lib/*.la \
> +  ${libdir}/gstreamer-0.10/*.la \
> +"
> +
> +FILES_${PN}-dbg += "\
> +  ${libdir}/bluetooth/plugins/.debug \
> +  ${libdir}/*/.debug \
> +"

Merged into OE-Core

Thanks
	Sau!
Koen Kooi - Aug. 15, 2011, 5:32 p.m.
Op 15 aug. 2011 om 19:02 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven:

> On 08/12/2011 01:04 AM, Noor, Ahsan wrote:
>> From: Noor Ahsan<noor_ahsan@mentor.com>
>> 
>> * Added new recipe 4.96 and removed 4.82 version and its files.
>> 
>> 
>> Signed-off-by: Noor Ahsan<noor_ahsan@mentor.com>
>> ---
>>  .../bluez/bluez4-4.82/bluetooth.conf               |   16 ----
>>  .../fix-dfutool-usb-declaration-mismatch.patch     |   20 -----
>>  .../bluez/bluez4-4.82/hid2hci_usb_init.patch       |   35 ---------
>>  .../bluez/bluez4-4.82/sbc-thumb.patch              |   14 ----
>>  .../bluez/bluez4-4.96/bluetooth.conf               |   16 ++++
>>  meta/recipes-connectivity/bluez/bluez4_4.82.bb     |   75 --------------------
>>  meta/recipes-connectivity/bluez/bluez4_4.96.bb     |   73 +++++++++++++++++++
>>  7 files changed, 89 insertions(+), 160 deletions(-)
>> 
>> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
>> deleted file mode 100644
>> index ca5e9e4..0000000
>> --- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
>> +++ /dev/null
>> @@ -1,16 +0,0 @@
>> -<!-- This configuration file specifies the required security policies
>> -     for Bluetooth core daemon to work. -->
>> -
>> -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
>> - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
>> -<busconfig>
>> -
>> -<!-- ../system.conf have denied everything, so we just punch some holes -->
>> -
>> -<policy context="default">
>> -<allow own="org.bluez"/>
>> -<allow send_destination="org.bluez"/>
>> -<allow send_interface="org.bluez.Agent"/>
>> -</policy>
>> -
>> -</busconfig>
>> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
>> deleted file mode 100644
>> index 27dead0..0000000
>> --- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
>> +++ /dev/null
>> @@ -1,20 +0,0 @@
>> -# bluez4: add compile patch fixing some usb declaration mismatch
>> -# Author: Michael 'Mickey' Lauer<mickey@vanille-media.de>
>> -# Date:   Thu Jan 29 16:52:21 2009 +0000
>> -#
>> -# Acquired from OpenEmbedded
>> -Upstream-Status: Pending
>> -
>> -Index: bluez-4.27/tools/dfutool.c
>> -===================================================================
>> ---- bluez-4.27.orig/tools/dfutool.c
>> -+++ bluez-4.27/tools/dfutool.c
>> -@@ -59,7 +59,7 @@
>> - #endif
>> -
>> - #ifdef NEED_USB_GET_BUSSES
>> --static inline struct usb_bus *usb_get_busses(void)
>> -+inline struct usb_bus *usb_get_busses(void)
>> - {
>> -    return usb_busses;
>> - }
>> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
>> deleted file mode 100644
>> index e8a58e5..0000000
>> --- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
>> +++ /dev/null
>> @@ -1,35 +0,0 @@
>> -# Signed-off-by: Khem Raj<raj.khem@gmail.com>
>> -#
>> -# Use the new usb1 API for usb_init() and check for fails from
>> -# usb_init (). Currently we see a crash on a system which does
>> -# not have USB because usb_init() fails and it cleans up all initialized
>> -# data (e.g. ctx) which is used in subsequent calls to libusb
>> -# We return immediately if usb_init() fails for some reason.
>> -
>> -Upstream-Status: Inappropriate [not used]
>> -
>> -Index: bluez-4.24/tools/hid2hci.c
>> -===================================================================
>> ---- bluez-4.24.orig/tools/hid2hci.c    2008-10-25 23:40:34.000000000 -0700
>> -+++ bluez-4.24/tools/hid2hci.c    2008-12-29 22:06:04.000000000 -0800
>> -@@ -337,7 +337,7 @@
>> - int main(int argc, char *argv[])
>> - {
>> -    struct device_info dev[16];
>> --    int i, opt, num, quiet = 0, mode = HCI;
>> -+    int i, ret, opt, num, quiet = 0, mode = HCI;
>> -
>> -    while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
>> -        switch (opt) {
>> -@@ -361,8 +361,9 @@
>> -    argc -= optind;
>> -    argv += optind;
>> -    optind = 0;
>> --
>> --    usb_init();
>> -+    ret = libusb_init();
>> -+    if (ret<  0)
>> -+        return ret;
>> -
>> -    num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
>> -    if (num<= 0) {
>> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
>> deleted file mode 100644
>> index 881cb9c..0000000
>> --- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
>> +++ /dev/null
>> @@ -1,14 +0,0 @@
>> -# Acquired from OpenEmbedded
>> -Upstream-Status: Inappropriate [embedded specific]
>> -
>> ---- bluez/sbc/sbc_math.h~    2008-03-05 20:18:03.000000000 +0000
>> -+++ bluez/sbc/sbc_math.h    2008-10-27 13:39:27.000000000 +0000
>> -@@ -59,7 +59,7 @@
>> -
>> - #define SBC_FIXED_0(val) { val = 0; }
>> - #define MUL(a, b)        ((a) * (b))
>> --#ifdef __arm__
>> -+#if defined(__arm__)&&  !defined(__thumb__)
>> - #define MULA(a, b, res) ({                \
>> -        int tmp = res;            \
>> -        __asm__(                \
>> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
>> new file mode 100644
>> index 0000000..ca5e9e4
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
>> @@ -0,0 +1,16 @@
>> +<!-- This configuration file specifies the required security policies
>> +     for Bluetooth core daemon to work. -->
>> +
>> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
>> + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
>> +<busconfig>
>> +
>> +<!-- ../system.conf have denied everything, so we just punch some holes -->
>> +
>> +<policy context="default">
>> +<allow own="org.bluez"/>
>> +<allow send_destination="org.bluez"/>
>> +<allow send_interface="org.bluez.Agent"/>
>> +</policy>
>> +
>> +</busconfig>
>> diff --git a/meta/recipes-connectivity/bluez/bluez4_4.82.bb b/meta/recipes-connectivity/bluez/bluez4_4.82.bb
>> deleted file mode 100644
>> index 9895006..0000000
>> --- a/meta/recipes-connectivity/bluez/bluez4_4.82.bb
>> +++ /dev/null
>> @@ -1,75 +0,0 @@
>> -SUMMARY = "Linux Bluetooth Stack Userland V4"
>> -DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These include a system configurations, daemons, tools and system libraries."
>> -HOMEPAGE = "http://www.bluez.org"
>> -SECTION = "libs"
>> -LICENSE = "GPLv2+&  LGPLv2.1+"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
>> -                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
>> -                    file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
>> -                    file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
>> -DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
>> -RDEPENDS_${PN}-dev = "bluez-hcidump"
>> -
>> -# For angstrom we want this to replace at least bluez-libs
>> -PROVIDES_append_angstrom = " bluez-utils bluez-libs"
>> -
>> -ASNEEDED = ""
>> -
>> -PR = "r0"
>> -
>> -SRC_URI = "\
>> -  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
>> -  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
>> -  file://sbc-thumb.patch;patch=1 \
>> -  file://bluetooth.conf \
>> -"
>> -
>> -SRC_URI[md5sum] = "b9e5de607e5e43c868c35c68fe6f189f"
>> -SRC_URI[sha256sum] = "75dc506f5346e1eb803f44294ae02406e806e309d9c9bda1de7ed235ff794b6d"
>> -S = "${WORKDIR}/bluez-${PV}"
>> -
>> -inherit autotools
>> -
>> -EXTRA_OECONF = "\
>> -  --enable-gstreamer \
>> -  --enable-alsa \
>> -  --enable-usb \
>> -  --enable-netlink \
>> -  --enable-tools \
>> -  --enable-bccmd \
>> -  --enable-hid2hci \
>> -  --enable-dfutool \
>> -  --enable-hidd \
>> -  --enable-pandd \
>> -  --enable-dund \
>> -  --disable-cups \
>> -  --enable-test \
>> -  --enable-manpages \
>> -  --enable-configfiles \
>> -  --enable-initscripts \
>> -  --disable-pcmciarules \
>> -"
>> -
>> -do_install_append() {
>> -    install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
>> -    install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
>> -    install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
>> -    # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
>> -    install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
>> -}
>> -
>> -PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
>> -
>> -FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
>> -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
>> -FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
>> -FILES_${PN}-dev += "\
>> -  ${libdir}/bluetooth/plugins/*.la \
>> -  ${libdir}/alsa-lib/*.la \
>> -  ${libdir}/gstreamer-0.10/*.la \
>> -"
>> -
>> -FILES_${PN}-dbg += "\
>> -  ${libdir}/bluetooth/plugins/.debug \
>> -  ${libdir}/*/.debug \
>> -"
>> diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
>> new file mode 100644
>> index 0000000..ebd2849
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
>> @@ -0,0 +1,73 @@
>> +SUMMARY = "Linux Bluetooth Stack Userland V4"
>> +DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These include a system configurations, daemons, tools and system libraries."
>> +HOMEPAGE = "http://www.bluez.org"
>> +SECTION = "libs"
>> +LICENSE = "GPLv2+&  LGPLv2.1+"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
>> +                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
>> +                    file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
>> +                    file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
>> +DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
>> +RDEPENDS_${PN}-dev = "bluez-hcidump"
>> +
>> +# For angstrom we want this to replace at least bluez-libs
>> +PROVIDES_append_angstrom = " bluez-utils bluez-libs"
>> +
>> +ASNEEDED = ""
>> +
>> +PR = "r0"
>> +
>> +SRC_URI = "\
>> +  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
>> +  file://bluetooth.conf \
>> +"
>> +
>> +SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
>> +SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
>> +S = "${WORKDIR}/bluez-${PV}"
>> +
>> +inherit autotools
>> +
>> +EXTRA_OECONF = "\
>> +  --enable-gstreamer \
>> +  --enable-alsa \
>> +  --enable-usb \
>> +  --enable-netlink \
>> +  --enable-tools \
>> +  --enable-bccmd \
>> +  --enable-hid2hci \
>> +  --enable-dfutool \
>> +  --enable-hidd \
>> +  --enable-pandd \
>> +  --enable-dund \
>> +  --disable-cups \
>> +  --enable-test \
>> +  --enable-manpages \
>> +  --enable-configfiles \
>> +  --enable-initscripts \
>> +  --disable-pcmciarules \
>> +"
>> +
>> +do_install_append() {
>> +    install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
>> +    install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
>> +    install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
>> +    # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
>> +    install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
>> +}
>> +
>> +PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
>> +
>> +FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
>> +FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
>> +FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
>> +FILES_${PN}-dev += "\
>> +  ${libdir}/bluetooth/plugins/*.la \
>> +  ${libdir}/alsa-lib/*.la \
>> +  ${libdir}/gstreamer-0.10/*.la \
>> +"
>> +
>> +FILES_${PN}-dbg += "\
>> +  ${libdir}/bluetooth/plugins/.debug \
>> +  ${libdir}/*/.debug \
>> +"
> 
> Merged into OE-Core

why was this known broken patch merged?!?!?


> 
> Thanks
>    Sau!
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Dexuan Cui - Aug. 16, 2011, 2:40 a.m.
Saul Wold wrote on 2011-08-16:
> On 08/12/2011 01:04 AM, Noor, Ahsan wrote:
>> From: Noor Ahsan<noor_ahsan@mentor.com>
>> * Added new recipe 4.96 and removed 4.82 version and its files.
>> Signed-off-by: Noor Ahsan<noor_ahsan@mentor.com>
> Merged into OE-Core

The patch causes a failure:
NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed
I reported http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this.

Thanks,
-- Dexuan
Martin Jansa - Aug. 16, 2011, 5:24 a.m.
On Tue, Aug 16, 2011 at 10:40:38AM +0800, Cui, Dexuan wrote:
> Saul Wold wrote on 2011-08-16:
> > On 08/12/2011 01:04 AM, Noor, Ahsan wrote:
> >> From: Noor Ahsan<noor_ahsan@mentor.com>
> >> * Added new recipe 4.96 and removed 4.82 version and its files.
> >> Signed-off-by: Noor Ahsan<noor_ahsan@mentor.com>
> > Merged into OE-Core
> 
> The patch causes a failure:
> NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed
> I reported http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this.

You need patch from this commit
http://git.openembedded.org/cgit.cgi/meta-openembedded/commit/?id=852ac4b589adb186191ad70a2fa3472d5b351ec4
or upgrade to 2.1

Regards,
Dexuan Cui - Aug. 16, 2011, 6:07 a.m.
Martin Jansa wrote on 2011-08-16:
> On Tue, Aug 16, 2011 at 10:40:38AM +0800, Cui, Dexuan wrote:
>> Saul Wold wrote on 2011-08-16:
>>> On 08/12/2011 01:04 AM, Noor, Ahsan wrote:
>>>> From: Noor Ahsan<noor_ahsan@mentor.com>
>>>> * Added new recipe 4.96 and removed 4.82 version and its files.
>>>> Signed-off-by: Noor Ahsan<noor_ahsan@mentor.com>
>>> Merged into OE-Core
>> 
>> The patch causes a failure:
>> NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed I 
>> reported
>> http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this.
> 
> You need patch from this commit
> http://git.openembedded.org/cgit.cgi/meta-openembedded/commit/?id=852
> ac4b589adb186191ad70a2fa3472d5b351ec4 or upgrade to 2.1
Martin, thanks for the suggestion!
Yes, I found 2.1 had integrated the fix, so I think we should choose to upgrade the package to 2.1 (I compared the source codes of 2.0 and 2.1 and looks they don't have many differences in other aspects).
I'll send out a patch later today.

Thanks,
-- Dexuan
Dexuan Cui - Aug. 16, 2011, 9:36 a.m.
Cui, Dexuan wrote on 2011-08-16:
> Martin Jansa wrote on 2011-08-16:
>> On Tue, Aug 16, 2011 at 10:40:38AM +0800, Cui, Dexuan wrote:
>>> Saul Wold wrote on 2011-08-16:
>>>> On 08/12/2011 01:04 AM, Noor, Ahsan wrote:
>>>>> From: Noor Ahsan<noor_ahsan@mentor.com>
>>>>> * Added new recipe 4.96 and removed 4.82 version and its files.
>>>>> Signed-off-by: Noor Ahsan<noor_ahsan@mentor.com>
>>>> Merged into OE-Core
>>> 
>>> The patch causes a failure:
>>> NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed I
>>> reported
>>> http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this.
>> 
>> You need patch from this commit
>> 
>> http://git.openembedded.org/cgit.cgi/meta-openembedded/commit/?id=852
>> ac4b589adb186191ad70a2fa3472d5b351ec4 or upgrade to 2.1
> Martin, thanks for the suggestion!
> Yes, I found 2.1 had integrated the fix, so I think we should choose
> to upgrade the package to 2.1 (I compared the source codes of 2.0 and
> 2.1 and looks they don't have many differences in other aspects).
> I'll send out a patch later today.
This is the patch.
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/master&id=17e0fb707e9ad926058898d39d32168f4e582ed1

I'm testing my branch with other patches. So I'll wait for several hours (2~4 hours) and send out all the patches together. :-)

Thanks,
-- Dexuan

Patch

diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
deleted file mode 100644
index ca5e9e4..0000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
+++ /dev/null
@@ -1,16 +0,0 @@ 
-<!-- This configuration file specifies the required security policies
-     for Bluetooth core daemon to work. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- ../system.conf have denied everything, so we just punch some holes -->
-
-  <policy context="default">
-    <allow own="org.bluez"/>
-    <allow send_destination="org.bluez"/>
-    <allow send_interface="org.bluez.Agent"/>
-  </policy>
-
-</busconfig>
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
deleted file mode 100644
index 27dead0..0000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# bluez4: add compile patch fixing some usb declaration mismatch
-# Author: Michael 'Mickey' Lauer <mickey@vanille-media.de>
-# Date:   Thu Jan 29 16:52:21 2009 +0000
-#
-# Acquired from OpenEmbedded
-Upstream-Status: Pending
-
-Index: bluez-4.27/tools/dfutool.c
-===================================================================
---- bluez-4.27.orig/tools/dfutool.c
-+++ bluez-4.27/tools/dfutool.c
-@@ -59,7 +59,7 @@
- #endif
- 
- #ifdef NEED_USB_GET_BUSSES
--static inline struct usb_bus *usb_get_busses(void)
-+inline struct usb_bus *usb_get_busses(void)
- {
- 	return usb_busses;
- }
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
deleted file mode 100644
index e8a58e5..0000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-# Signed-off-by: Khem Raj <raj.khem@gmail.com>
-#
-# Use the new usb1 API for usb_init() and check for fails from 
-# usb_init (). Currently we see a crash on a system which does
-# not have USB because usb_init() fails and it cleans up all initialized
-# data (e.g. ctx) which is used in subsequent calls to libusb
-# We return immediately if usb_init() fails for some reason.
-
-Upstream-Status: Inappropriate [not used]
-
-Index: bluez-4.24/tools/hid2hci.c
-===================================================================
---- bluez-4.24.orig/tools/hid2hci.c	2008-10-25 23:40:34.000000000 -0700
-+++ bluez-4.24/tools/hid2hci.c	2008-12-29 22:06:04.000000000 -0800
-@@ -337,7 +337,7 @@
- int main(int argc, char *argv[])
- {
- 	struct device_info dev[16];
--	int i, opt, num, quiet = 0, mode = HCI;
-+	int i, ret, opt, num, quiet = 0, mode = HCI;
- 
- 	while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
- 		switch (opt) {
-@@ -361,8 +361,9 @@
- 	argc -= optind;
- 	argv += optind;
- 	optind = 0;
--
--	usb_init();
-+	ret = libusb_init();
-+	if (ret < 0)
-+		return ret;
- 
- 	num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
- 	if (num <= 0) {
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
deleted file mode 100644
index 881cb9c..0000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
+++ /dev/null
@@ -1,14 +0,0 @@ 
-# Acquired from OpenEmbedded
-Upstream-Status: Inappropriate [embedded specific]
-
---- bluez/sbc/sbc_math.h~	2008-03-05 20:18:03.000000000 +0000
-+++ bluez/sbc/sbc_math.h	2008-10-27 13:39:27.000000000 +0000
-@@ -59,7 +59,7 @@
- 
- #define SBC_FIXED_0(val) { val = 0; }
- #define MUL(a, b)        ((a) * (b))
--#ifdef __arm__
-+#if defined(__arm__) && !defined(__thumb__)
- #define MULA(a, b, res) ({				\
- 		int tmp = res;			\
- 		__asm__(				\
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
new file mode 100644
index 0000000..ca5e9e4
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
@@ -0,0 +1,16 @@ 
+<!-- This configuration file specifies the required security policies
+     for Bluetooth core daemon to work. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- ../system.conf have denied everything, so we just punch some holes -->
+
+  <policy context="default">
+    <allow own="org.bluez"/>
+    <allow send_destination="org.bluez"/>
+    <allow send_interface="org.bluez.Agent"/>
+  </policy>
+
+</busconfig>
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.82.bb b/meta/recipes-connectivity/bluez/bluez4_4.82.bb
deleted file mode 100644
index 9895006..0000000
--- a/meta/recipes-connectivity/bluez/bluez4_4.82.bb
+++ /dev/null
@@ -1,75 +0,0 @@ 
-SUMMARY = "Linux Bluetooth Stack Userland V4"
-DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These include a system configurations, daemons, tools and system libraries."
-HOMEPAGE = "http://www.bluez.org"
-SECTION = "libs"
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
-                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
-                    file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
-                    file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
-DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
-RDEPENDS_${PN}-dev = "bluez-hcidump"
-
-# For angstrom we want this to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
-
-ASNEEDED = ""
-
-PR = "r0"
-
-SRC_URI = "\
-  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
-  file://bluetooth.conf \
-"
-
-SRC_URI[md5sum] = "b9e5de607e5e43c868c35c68fe6f189f"
-SRC_URI[sha256sum] = "75dc506f5346e1eb803f44294ae02406e806e309d9c9bda1de7ed235ff794b6d"
-S = "${WORKDIR}/bluez-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "\
-  --enable-gstreamer \
-  --enable-alsa \
-  --enable-usb \
-  --enable-netlink \
-  --enable-tools \
-  --enable-bccmd \
-  --enable-hid2hci \
-  --enable-dfutool \
-  --enable-hidd \
-  --enable-pandd \
-  --enable-dund \
-  --disable-cups \
-  --enable-test \
-  --enable-manpages \
-  --enable-configfiles \
-  --enable-initscripts \
-  --disable-pcmciarules \
-"
-
-do_install_append() {
-	install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
-	install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
-	install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
-	# at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
-	install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
-}
-
-PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
-
-FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
-FILES_${PN}-dev += "\
-  ${libdir}/bluetooth/plugins/*.la \
-  ${libdir}/alsa-lib/*.la \
-  ${libdir}/gstreamer-0.10/*.la \
-"
-
-FILES_${PN}-dbg += "\
-  ${libdir}/bluetooth/plugins/.debug \
-  ${libdir}/*/.debug \
-"
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
new file mode 100644
index 0000000..ebd2849
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -0,0 +1,73 @@ 
+SUMMARY = "Linux Bluetooth Stack Userland V4"
+DESCRIPTION = "Linux Bluetooth stack V4 userland components.  These include a system configurations, daemons, tools and system libraries."
+HOMEPAGE = "http://www.bluez.org"
+SECTION = "libs"
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
+                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
+                    file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
+                    file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
+DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
+RDEPENDS_${PN}-dev = "bluez-hcidump"
+
+# For angstrom we want this to replace at least bluez-libs
+PROVIDES_append_angstrom = " bluez-utils bluez-libs"
+
+ASNEEDED = ""
+
+PR = "r0"
+
+SRC_URI = "\
+  ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
+  file://bluetooth.conf \
+"
+
+SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
+SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
+S = "${WORKDIR}/bluez-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+  --enable-gstreamer \
+  --enable-alsa \
+  --enable-usb \
+  --enable-netlink \
+  --enable-tools \
+  --enable-bccmd \
+  --enable-hid2hci \
+  --enable-dfutool \
+  --enable-hidd \
+  --enable-pandd \
+  --enable-dund \
+  --disable-cups \
+  --enable-test \
+  --enable-manpages \
+  --enable-configfiles \
+  --enable-initscripts \
+  --disable-pcmciarules \
+"
+
+do_install_append() {
+	install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
+	install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
+	install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
+	# at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
+	install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
+}
+
+PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
+
+FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
+FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
+FILES_${PN}-dev += "\
+  ${libdir}/bluetooth/plugins/*.la \
+  ${libdir}/alsa-lib/*.la \
+  ${libdir}/gstreamer-0.10/*.la \
+"
+
+FILES_${PN}-dbg += "\
+  ${libdir}/bluetooth/plugins/.debug \
+  ${libdir}/*/.debug \
+"