aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-06-07 16:37:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-08 11:38:43 +0100
commite510f6947f9e14c408b0e5e4f10cea3353b271c2 (patch)
treea00149036de9109b9efc9f1845977ddc2c668f9c /meta/recipes-connectivity
parent1583a8e2db6dd4843ff45acee458d4924f7d6ced (diff)
downloadopenembedded-core-contrib-e510f6947f9e14c408b0e5e4f10cea3353b271c2.tar.gz
connman: respect the 3g feature and enable/disable ofono support
[YOCTO #2357] Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
-rw-r--r--meta/recipes-connectivity/connman/connman_0.79.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index f2da8d9d745..58e3f562fd2 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
- ofono \
+ ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
"
TIST = "--enable-tist"
@@ -34,7 +34,7 @@ EXTRA_OECONF += "\
${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
--enable-dnsproxy \
- --enable-ofono \
+ ${@base_contains('DISTRO_FEATURES', '3g', '', '--disable-ofono', d)} \
--enable-tools \
--enable-test \
--disable-polkit \
diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb
index d7f22b94a1e..ec3d147d84d 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 = "r4"
+PR = "r5"