summaryrefslogtreecommitdiffstats
path: root/meta
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:43:21 +0100
commit554afde11fa01eeafbe160d4349d8426fac09196 (patch)
treebc6ef1cca7ffc3dae485515696584443537fcdfb /meta
parent17207058b26fca6b2c59a1a11e5f84a3c803a319 (diff)
downloadpoky-554afde11fa01eeafbe160d4349d8426fac09196.tar.gz
poky-554afde11fa01eeafbe160d4349d8426fac09196.tar.bz2
poky-554afde11fa01eeafbe160d4349d8426fac09196.zip
connman: respect the 3g feature and enable/disable ofono support
[YOCTO #2357] (From OE-Core rev: e510f6947f9e14c408b0e5e4f10cea3353b271c2) 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')
-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 f2da8d9d74..58e3f562fd 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 d7f22b94a1..ec3d147d84 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"