Merge branch 'next'

Conflicts:
	package/gdb/Config.in.host

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2014-06-01 09:58:54 +02:00
97 changed files with 1657 additions and 1664 deletions

View File

@@ -3,17 +3,16 @@ config BR2_PACKAGE_CONNMAN
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_IPTABLES
select BR2_PACKAGE_GNUTLS
depends on !BR2_avr32 # no inotify_init1
depends on !BR2_UCLIBC_VERSION_0_9_32
depends on BR2_USE_WCHAR # libglib2 and gnutls
depends on BR2_USE_WCHAR # libglib2
depends on BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
depends on BR2_USE_MMU # dbus, libglib2
help
The Connection Manager (ConnMan) project provides a daemon for
managing internet connections within embedded devices running
the Linux operating system.
The Connection Manager (ConnMan) project provides a daemon
for managing internet connections within embedded devices
running the Linux operating system.
For more information, see https://01.org/connman
@@ -25,10 +24,26 @@ config BR2_PACKAGE_CONNMAN_ETHERNET
config BR2_PACKAGE_CONNMAN_WIFI
bool "enable WiFi support"
select BR2_PACKAGE_WPA_SUPPLICANT
select BR2_PACKAGE_WPA_SUPPLICANT # runtime
help
Enable WiFi support (scan and static/dhcp interface
setup). ConnMan detects the start of wpa_supplicant
automatically.
config BR2_PACKAGE_CONNMAN_WISPR
bool "enable WISPr support"
select BR2_PACKAGE_GNUTLS
help
Enable support for Wireless Internet Service Provider
roaming (WISPr). A RADIUS server is used to authenticate the
subscriber's credentials.
config BR2_PACKAGE_CONNMAN_BLUETOOTH
bool "enable Bluetooth support"
help
Enable Bluetooth (PAN profile) support. The start of
bluetoothd is automatically detected and only a runtime
dependency.
config BR2_PACKAGE_CONNMAN_LOOPBACK
bool "enable loopback support"

View File

@@ -7,7 +7,7 @@
CONNMAN_VERSION = 1.23
CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
CONNMAN_DEPENDENCIES = libglib2 dbus iptables
CONNMAN_INSTALL_STAGING = YES
CONNMAN_LICENSE = GPLv2
CONNMAN_LICENSE_FILES = COPYING
@@ -15,6 +15,7 @@ CONNMAN_CONF_OPT += --localstatedir=/var \
$(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_WISPR),--enable-wispr,--disable-wispr) \
$(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) \
@@ -23,7 +24,8 @@ CONNMAN_CONF_OPT += --localstatedir=/var \
CONNMAN_DEPENDENCIES += \
$(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \
$(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono)
$(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono) \
$(if $(BR2_PACKAGE_CONNMAN_WISPR),gnutls)
define CONNMAN_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman