aboutsummaryrefslogtreecommitdiff
path: root/package/connman
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2013-12-01 20:31:43 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2013-12-01 20:32:00 +0100
commit50ce7ffb76b989c90636876153e568da7615b8c3 (patch)
tree1de9424dd5332431d2a30d3aafe332e7c0999476 /package/connman
parent9b3904543ca04c5d5fe5f6974539eed376de2290 (diff)
parentcb08d7b05db54eb7b2c52deabbd57c541777a422 (diff)
downloadbuildroot-50ce7ffb76b989c90636876153e568da7615b8c3.tar.gz
buildroot-50ce7ffb76b989c90636876153e568da7615b8c3.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/connman')
-rw-r--r--package/connman/Config.in14
-rw-r--r--package/connman/connman-001-fix-for-latest-headers-3.8+.patch19
-rw-r--r--package/connman/connman.mk10
3 files changed, 14 insertions, 29 deletions
diff --git a/package/connman/Config.in b/package/connman/Config.in
index 021e2112ae..4a4090fe76 100644
--- 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
@@ -38,8 +33,13 @@ config BR2_PACKAGE_CONNMAN_BLUETOOTH
config BR2_PACKAGE_CONNMAN_LOOPBACK
bool "enable loopback support"
-config BR2_PACKAGE_CONNMAN_NTPD
- bool "enable ntpd support"
+config BR2_PACKAGE_CONNMAN_NEARD
+ bool "enable neard support"
+ select BR2_PACKAGE_NEARD
+
+config BR2_PACKAGE_CONNMAN_OFONO
+ bool "enable ofono support"
+ select BR2_PACKAGE_OFONO
config BR2_PACKAGE_CONNMAN_DEBUG
bool "enable compiling with debugging information"
diff --git a/package/connman/connman-001-fix-for-latest-headers-3.8+.patch b/package/connman/connman-001-fix-for-latest-headers-3.8+.patch
deleted file mode 100644
index ef1fabcc7c..0000000000
--- a/package/connman/connman-001-fix-for-latest-headers-3.8+.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-tethering: fix build with kernel headers 3.8+
-
-Highly inspired by:
- package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch
- http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN connman-1.11.orig/src/tethering.c connman-1.11/src/tethering.c
---- connman-1.11.orig/src/tethering.c 2012-12-22 22:52:47.000000000 +0100
-+++ connman-1.11/src/tethering.c 2013-03-21 19:39:17.036029270 +0100
-@@ -35,6 +35,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <linux/if_tun.h>
-+#include <netinet/in.h>
- #include <linux/if_bridge.h>
-
- #include "connman.h"
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 4a6bb78ad4..64c1f0e01e 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CONNMAN_VERSION = 1.12
+CONNMAN_VERSION = 1.19
CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
@@ -12,13 +12,17 @@ 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_NTPD),--enable-ntpd,--disable-ntpd)
+ $(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \
+ $(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono)
+
+CONNMAN_DEPENDENCIES += \
+ $(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \
+ $(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono)
define CONNMAN_INSTALL_INITSCRIPT
$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman