Re: [meta-arago-extras][PATCH] bluez: Disable hid2hci and add test/agent

[Denys Dmytriyenko <denis@denix.org>]

On Fri, Sep 21, 2012 at 07:51:53PM -0500, Franklin S. Cooper Jr wrote:
> * This append is based on changes to the bluez4 recipe that were
>   made in arago.
> * Disable hid2hci since udev 164 which is currently being used
>   already provides hid2hci.
> * Package test/agent which is used for testing.
> * Add additional patches which fix unwanted behavior or enable features.
> 
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../0001-bluez-enable-source-interface.patch       |   30 ++++++++++++
>  .../bluez4/0001-socket-enable-for-bluez-4_98.patch |   24 ++++++++++
>  .../recipes-connectivity/bluez/bluez4/amend.inc    |   13 +++++
>  ...synchronization-between-bluetoothd-and-dr.patch |   49 ++++++++++++++++++++
>  .../bluez/bluez4_4.99.bbappend                     |   23 +++++++++
>  5 files changed, 139 insertions(+), 0 deletions(-)
>  create mode 100644 meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-bluez-enable-source-interface.patch
>  create mode 100644 meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-socket-enable-for-bluez-4_98.patch
>  create mode 100644 meta-arago-distro/recipes-connectivity/bluez/bluez4/amend.inc

Why do you have amend.inc here?


>  create mode 100755 meta-arago-distro/recipes-connectivity/bluez/bluez4/bluez4-fix-synchronization-between-bluetoothd-and-dr.patch
>  create mode 100644 meta-arago-distro/recipes-connectivity/bluez/bluez4_4.99.bbappend
> 
> diff --git a/meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-bluez-enable-source-interface.patch b/meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-bluez-enable-source-interface.patch
> new file mode 100644
> index 0000000..a705c4e
> --- /dev/null
> +++ b/meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-bluez-enable-source-interface.patch
> @@ -0,0 +1,30 @@
> +From 87bcf52a6e9f2ec018bab9dd0da2a2b844b37108 Mon Sep 17 00:00:00 2001
> +From: Moosa <moosab@ti.com>
> +Date: Wed, 14 Mar 2012 16:43:57 +0200
> +Subject: [PATCH] bluez: enable source interface
> +
> +Enable Source interface on D-Bus that can be used to access
> +the Sink functionality
> +
> +Upstream-Status: Inappropriate [enable feature]
> +
> +Signed-off-by: Moosa Baransi <moosab@ti.com>
> +---
> + audio/audio.conf |    2 +-
> + 1 files changed, 1 insertions(+), 1 deletions(-)
> +
> +diff --git a/audio/audio.conf b/audio/audio.conf
> +index 9533ada..b554936 100644
> +--- a/audio/audio.conf
> ++++ b/audio/audio.conf
> +@@ -3,7 +3,7 @@
> + # This section contains options which are not specific to any
> + # particular interface
> + [General]
> +-Enable=Socket
> ++Enable=Socket,Source
> +
> + # Switch to master role for incoming connections (defaults to true)
> + #Master=true
> +--
> +1.7.1
> diff --git a/meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-socket-enable-for-bluez-4_98.patch b/meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-socket-enable-for-bluez-4_98.patch
> new file mode 100644
> index 0000000..025e7fa
> --- /dev/null
> +++ b/meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-socket-enable-for-bluez-4_98.patch
> @@ -0,0 +1,24 @@
> +From e142a28897c0b0fe9e61259a96dad6fb9f818ecd Mon Sep 17 00:00:00 2001
> +From: Moosa <moosa.baransi@babcomsoftware.com>
> +Date: Wed, 22 Feb 2012 10:06:37 +0200
> +Subject: [PATCH] socket enable for bluez 0_98
> +
> +* This is necessary for working with A2DP
> +---
> + audio/audio.conf |    1 +
> + 1 files changed, 1 insertions(+), 0 deletions(-)
> +
> +diff --git a/audio/audio.conf b/audio/audio.conf
> +index 302e046..9533ada 100644
> +--- a/audio/audio.conf
> ++++ b/audio/audio.conf
> +@@ -3,6 +3,7 @@
> + # This section contains options which are not specific to any
> + # particular interface
> + [General]
> ++Enable=Socket
> +
> + # Switch to master role for incoming connections (defaults to true)
> + #Master=true
> +--
> +1.7.1
> diff --git a/meta-arago-distro/recipes-connectivity/bluez/bluez4/amend.inc b/meta-arago-distro/recipes-connectivity/bluez/bluez4/amend.inc
> new file mode 100644
> index 0000000..2e2ec67
> --- /dev/null
> +++ b/meta-arago-distro/recipes-connectivity/bluez/bluez4/amend.inc

There's no need for this.


> @@ -0,0 +1,13 @@
> +# Arago-specific amendments to the standard bluez4 recipes
> +
> +# Add test/agent for testing
> +
> +PACKAGES =+ "bluez4-agent"
> +
> +do_install_append () {
> +	${TARGET_PREFIX}libtool --mode=install install -c 'test/agent' ${D}${bindir}/agent
> +}
> +
> +FILES_bluez4-agent = "${bindir}/agent"
> +
> +PR_append = "-arago2"
> diff --git a/meta-arago-distro/recipes-connectivity/bluez/bluez4/bluez4-fix-synchronization-between-bluetoothd-and-dr.patch b/meta-arago-distro/recipes-connectivity/bluez/bluez4/bluez4-fix-synchronization-between-bluetoothd-and-dr.patch
> new file mode 100755
> index 0000000..7ca0bd7
> --- /dev/null
> +++ b/meta-arago-distro/recipes-connectivity/bluez/bluez4/bluez4-fix-synchronization-between-bluetoothd-and-dr.patch
> @@ -0,0 +1,49 @@
> +From ddca351e504dc3cb8d91ea10a1863949699c6e50 Mon Sep 17 00:00:00 2001
> +From: Vita Preskovsky <vitap@ti.com>
> +Date: Tue, 13 Dec 2011 22:54:47 +0200
> +Subject: [PATCH] bluez4: fix synchronization between bluetoothd and driver
> +  * To fix situation when bluetoothd doesn't get messages
> +    it expects to receive from the kernel. Therefore the
> +    the required requests are sent again at the stage when device
> +    is up. The mismatch caused to the list of adapters to be
> +    empty.
> +
> +Signed-off-by: Vita Preskovsky <vitap@ti.com>
> +---
> + plugins/hciops.c |   21 +++++++++++++++++++++
> + 1 files changed, 21 insertions(+), 0 deletions(-)
> +
> +diff --git a/plugins/hciops.c b/plugins/hciops.c
> +index ecc0e86..e2198ee 100644
> +--- a/plugins/hciops.c
> ++++ b/plugins/hciops.c
> +@@ -2512,6 +2512,27 @@ static void device_devup_setup(int index)
> +	hci_send_cmd(dev->sk, OGF_HOST_CTL, OCF_READ_STORED_LINK_KEY,
> +					READ_STORED_LINK_KEY_CP_SIZE, &cp);
> +
> ++	/* Even though it shouldn't happen it seems like we might miss
> ++	 * initialization commands that kernel sends. So we check it here
> ++	 * to avoid situation when we have device but it is not in the list
> ++	 * of adapters. */
> ++       if (hci_test_bit(PENDING_FEATURES, &dev->pending))
> ++               hci_send_cmd(dev->sk, OGF_INFO_PARAM,
> ++                                       OCF_READ_LOCAL_FEATURES, 0, NULL);
> ++
> ++       if (hci_test_bit(PENDING_VERSION, &dev->pending))
> ++               hci_send_cmd(dev->sk, OGF_INFO_PARAM,
> ++                                       OCF_READ_LOCAL_VERSION, 0, NULL);
> ++
> ++       if (hci_test_bit(PENDING_NAME, &dev->pending))
> ++               hci_send_cmd(dev->sk, OGF_HOST_CTL,
> ++                                       OCF_READ_LOCAL_NAME, 0, NULL);
> ++
> ++       if (hci_test_bit(PENDING_BDADDR, &dev->pending))
> ++               hci_send_cmd(dev->sk, OGF_INFO_PARAM,
> ++                                       OCF_READ_BD_ADDR, 0, NULL);
> ++
> ++
> +	if (!dev->pending)
> +		init_adapter(index);
> + }
> +--
> +1.7.0.4
> diff --git a/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.99.bbappend b/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.99.bbappend
> new file mode 100644
> index 0000000..b80f110
> --- /dev/null
> +++ b/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.99.bbappend
> @@ -0,0 +1,23 @@
> +PR_append = "-arago0"
> +
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +
> +SRC_URI += "file://bluez4-fix-synchronization-between-bluetoothd-and-dr.patch \
> +            file://0001-socket-enable-for-bluez-4_98.patch \
> +            file://0001-bluez-enable-source-interface.patch \
> +"
> +# udev 150-170 provide its on hid2hci tool and udev rules for it. Therefore,
> +# disabling hid2hci from bluez4.
> +EXTRA_OECONF := "${@'${EXTRA_OECONF}'.replace('--enable-hid2hci', '')}"
> +EXTRA_OECONF += " --disable-hid2hci"

If you are using replace, you can directly replace to disable. Otherwise, why 
not use oe_filter_out?


> +
> +DEPENDS += "libsndfile1"
> +
> +# Add test/agent for testing
> +PACKAGES =+ "bluez4-agent"
> +
> +do_install_append () {
> +	${TARGET_SYS}-libtool --mode=install install -c 'test/agent' ${D}${bindir}/agent
> +}
> +
> +FILES_bluez4-agent = "${bindir}/agent"
> -- 
> 1.7.0.4
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>