connman: remove defunkt configuration options

We are carrying support for a couple of configuration options which
are no longer present in connman. Specifically:
; threads: vestigial configuration option needed for defunkt WiMAX plugin
; ntpd: plugin no longer present in connman

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 1cf93e2e16e263ac57b5c72a06695d5b0607807d..0c381af77357bac7e2ffca7aa84d90bc26ea1b71 100644 (file)
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -19,11 +19,6 @@ config BR2_PACKAGE_CONNMAN
 
 if BR2_PACKAGE_CONNMAN
 
-config BR2_PACKAGE_CONNMAN_THREADS
-       bool "enable threading support"
-       depends on BR2_TOOLCHAIN_HAS_THREADS
-       default y
-
 config BR2_PACKAGE_CONNMAN_ETHERNET
        bool "enable Ethernet support"
        default y
@@ -42,9 +37,6 @@ config BR2_PACKAGE_CONNMAN_NEARD
        bool "enable neard support"
        select BR2_PACKAGE_NEARD
 
-config BR2_PACKAGE_CONNMAN_NTPD
-       bool "enable ntpd support"
-
 config BR2_PACKAGE_CONNMAN_OFONO
        bool "enable ofono support"
        select BR2_PACKAGE_OFONO

diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index cf54abc5479d04f33a3ad65287e6e5430493e694..64c1f0e01e08c4f1055aebee1b418527b524b7e3 100644 (file)
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -12,14 +12,12 @@ CONNMAN_INSTALL_STAGING = YES
 CONNMAN_LICENSE = GPLv2
 CONNMAN_LICENSE_FILES = COPYING
 CONNMAN_CONF_OPT += --localstatedir=/var \
-       $(if $(BR2_PACKAGE_CONNMAN_THREADS),--enable-threads,--disable-threads)         \
        $(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug)               \
        $(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet)      \
        $(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi)                  \
        $(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth)   \
        $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback)      \
        $(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \
-       $(if $(BR2_PACKAGE_CONNMAN_NTPD),--enable-ntpd,--disable-ntpd) \
        $(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono)
 
 CONNMAN_DEPENDENCIES += \