summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-06-20 12:27:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:03:04 +0100
commit89eebaa03a40e3e3b3710acc972d550da4709a80 (patch)
treea542f68ecd5231168d93e9dd38ccd752f5525f92
parent1d86b2c3632d61756ac60ce7993be09f52516e52 (diff)
downloadpoky-89eebaa03a40e3e3b3710acc972d550da4709a80.tar.gz
connman: rationalise configure options
dnsproxy and ntpd don't exist anymore, and the client is almost entirely useless. (From OE-Core rev: ed328572c7c286ecc2b27bb89eb8d795eda9bb8c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 34123234dd..7a1061571b 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 " 21 "
22 22
23INC_PR = "r6" 23INC_PR = "r7"
24 24
25TIST = "--enable-tist" 25TIST = "--enable-tist"
26TIST_powerpc = "" 26TIST_powerpc = ""
@@ -35,14 +35,12 @@ EXTRA_OECONF += "\
35 --enable-ethernet \ 35 --enable-ethernet \
36 ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \ 36 ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
37 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \ 37 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
38 --enable-dnsproxy \
39 ${@base_contains('DISTRO_FEATURES', '3g', '', '--disable-ofono', d)} \ 38 ${@base_contains('DISTRO_FEATURES', '3g', '', '--disable-ofono', d)} \
40 --enable-tools \ 39 --enable-tools \
41 --enable-test \ 40 --enable-test \
42 --disable-polkit \ 41 --disable-polkit \
43 --enable-client \ 42 --disable-client \
44 --enable-fake \ 43 --enable-fake \
45 --disable-ntpd \
46" 44"
47 45
48INITSCRIPT_NAME = "connman" 46INITSCRIPT_NAME = "connman"