[oe-commits] Ross Burton : connman: respect the 3g feature and enable/ disable ofono support
git at git.openembedded.org
git at git.openembedded.org
Fri Jun 8 10:44:09 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: e510f6947f9e14c408b0e5e4f10cea3353b271c2
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e510f6947f9e14c408b0e5e4f10cea3353b271c2
Author: Ross Burton <ross.burton at intel.com>
Date: Thu Jun 7 16:37:04 2012 -0700
connman: respect the 3g feature and enable/disable ofono support
[YOCTO #2357]
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan at intel.com>
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 f2da8d9..58e3f56 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 d7f22b9..ec3d147 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"
More information about the Openembedded-commits
mailing list