[oe-commits] Koen Kooi : connman: enable TI shared transport plugin when wifi or bluetooth are requested

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 22254a32f05e9212411216bf1a4e48fd86b9c3ef
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=22254a32f05e9212411216bf1a4e48fd86b9c3ef

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Fri May  4 09:54:06 2012 +0200

connman: enable TI shared transport plugin when wifi or bluetooth are requested

This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips.

The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless

The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-connectivity/connman/connman.inc     |    4 ++--
 meta/recipes-connectivity/connman/connman_0.79.bb |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index bfe6620..8b27cfb 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -28,8 +28,8 @@ EXTRA_OECONF += "\
     --enable-threads \
     --enable-loopback \
     --enable-ethernet \
-    ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \
     --enable-dnsproxy \
     --enable-ofono \
     --enable-tools \
diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb
index 4c57dab..d7f22b9 100644
--- a/meta/recipes-connectivity/connman/connman_0.79.bb
+++ b/meta/recipes-connectivity/connman/connman_0.79.bb
@@ -11,4 +11,4 @@ SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
             file://test-set-ipv6-method-api-fix.patch \
             file://connman"
 S = "${WORKDIR}/git"
-PR = "r3"
+PR = "r4"