mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2013-12-01 20:31:43 +01:00
parent 9b3904543c cb08d7b05d
commit 50ce7ffb76
82 changed files with 1481 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package/connman/Config.in
View File

@@ -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"

19
package/connman/connman-001-fix-for-latest-headers-3.8+.patch
View File

@@ -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"

10
package/connman/connman.mk
View File

@@ -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