[PATCH] bluez: 3.36 does not need the hciattach-ti-bts.patch. Fixes do_patch.

[PATCH] bluez: 3.36 does not need the hciattach-ti-bts.patch. Fixes do_patch.

[Rolf Leggewie]

From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>

---
 recipes/bluez/bluez-cups-backend_3.33.bb     |    4 ++++
 recipes/bluez/bluez-gstreamer-plugin_3.33.bb |    4 ++++
 recipes/bluez/bluez-utils-alsa_3.33.bb       |    4 ++++
 recipes/bluez/bluez-utils3.inc               |    2 --
 recipes/bluez/bluez-utils_3.33.bb            |    4 ++++
 recipes/bluez/bluez-utils_3.36.bb            |    5 -----
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/recipes/bluez/bluez-cups-backend_3.33.bb b/recipes/bluez/bluez-cups-backend_3.33.bb
index 40e0996..f3601b4 100644
--- a/recipes/bluez/bluez-cups-backend_3.33.bb
+++ b/recipes/bluez/bluez-cups-backend_3.33.bb
@@ -4,6 +4,10 @@ PR = "r1"
 
 DEPENDS += "cups"
 
+# TI patch landed upstream sometime between 3.35 and 3.36, 
+# albeit in a somewhat different form
+SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
+
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
                  --enable-bccmd \
diff --git a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
index 53b7eb8..f4e3ca4 100644
--- a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
+++ b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
@@ -4,6 +4,10 @@ PR = "r1"
 
 DEPENDS += "gstreamer gst-plugins-base "
 
+# TI patch landed upstream sometime between 3.35 and 3.36, 
+# albeit in a somewhat different form
+SRC_URI += "file://hciattach-ti-bts.patch;patch=1" 
+
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
                  --enable-bccmd \
diff --git a/recipes/bluez/bluez-utils-alsa_3.33.bb b/recipes/bluez/bluez-utils-alsa_3.33.bb
index a1e3e85..2558b87 100644
--- a/recipes/bluez/bluez-utils-alsa_3.33.bb
+++ b/recipes/bluez/bluez-utils-alsa_3.33.bb
@@ -4,6 +4,10 @@ PR = "r1"
 
 DEPENDS += "alsa-lib"
 
+# TI patch landed upstream sometime between 3.35 and 3.36, 
+# albeit in a somewhat different form
+SRC_URI += "file://hciattach-ti-bts.patch;patch=1" 
+
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
                  --enable-bccmd \
diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc
index 703788f..5fab6e7 100644
--- a/recipes/bluez/bluez-utils3.inc
+++ b/recipes/bluez/bluez-utils3.inc
@@ -10,10 +10,8 @@ LICENSE = "GPL"
 
 FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
 
-# ti patch should be sent it upstream!
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
-           file://hciattach-ti-bts.patch;patch=1 \
            file://sbc-thumb.patch;patch=1"
 
 
diff --git a/recipes/bluez/bluez-utils_3.33.bb b/recipes/bluez/bluez-utils_3.33.bb
index dc098e3..322f841 100644
--- a/recipes/bluez/bluez-utils_3.33.bb
+++ b/recipes/bluez/bluez-utils_3.33.bb
@@ -2,6 +2,10 @@ require bluez-utils3.inc
 
 PR = "r3"
 
+# TI patch landed upstream sometime between 3.35 and 3.36, 
+# albeit in a somewhat different form
+SRC_URI += "file://hciattach-ti-bts.patch;patch=1" 
+
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
                  --enable-bccmd \
diff --git a/recipes/bluez/bluez-utils_3.36.bb b/recipes/bluez/bluez-utils_3.36.bb
index bd319e8..20a9bad 100644
--- a/recipes/bluez/bluez-utils_3.36.bb
+++ b/recipes/bluez/bluez-utils_3.36.bb
@@ -2,11 +2,6 @@ require bluez-utils3.inc
 
 PR = "r4"
 
-# removed hciattach-ti-bts.patch (landed upstream)
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
-           file://hcid.conf \
-           file://sbc-thumb.patch;patch=1"
-
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
                  --enable-bccmd \
-- 
1.6.0.4

Re: [PATCH] bluez: 3.36 does not need the hciattach-ti-bts.patch. Fixes do_patch.

[Rolf Leggewie]

Explanation: The TI patch is not necessary for 3.36.  My patch to OE is 
necessary to make sure that recipes/bluez/bluez-cups-backend_3.33.bb 
actually succeeds in do_patch.

Re: [PATCH] bluez: 3.36 does not need the hciattach-ti-bts.patch. Fixes do_patch.

[Rolf Leggewie]

Rolf Leggewie wrote:
> Explanation: The TI patch is not necessary for 3.36.  My patch to OE is 
> necessary to make sure that recipes/bluez/bluez-cups-backend_3.33.bb 

3.36!

Re: [PATCH] bluez: 3.36 does not need the hciattach-ti-bts.patch. Fixes do_patch.

[Rolf Leggewie]

Rolf Leggewie wrote:
> Explanation: The TI patch is not necessary for 3.36.  My patch to OE is 
> necessary to make sure that recipes/bluez/bluez-cups-backend_3.33.bb 
> actually succeeds in do_patch.

no objections in about a week, so I took the liberty to push this.