diff options
Diffstat (limited to 'package/connman')
| -rw-r--r-- | package/connman/Config.in | 5 | ||||
| -rw-r--r-- | package/connman/connman-uclibc-backtrace.patch | 44 | ||||
| -rw-r--r-- | package/connman/connman.mk | 9 |
3 files changed, 50 insertions, 8 deletions
diff --git a/package/connman/Config.in b/package/connman/Config.in index 2801b87b0..3373ec1aa 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_CONNMAN select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_IPTABLES - depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc + select BR2_PACKAGE_GNUTLS + depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32) help The Connection Manager (ConnMan) project provides a daemon for managing internet connections within embedded devices running @@ -44,4 +45,4 @@ config BR2_PACKAGE_CONNMAN_CLIENT endif # BR2_PACKAGE_CONNMAN comment "connman needs a toolchain with resolver support" - depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc) + depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 diff --git a/package/connman/connman-uclibc-backtrace.patch b/package/connman/connman-uclibc-backtrace.patch new file mode 100644 index 000000000..4b806c6dd --- /dev/null +++ b/package/connman/connman-uclibc-backtrace.patch @@ -0,0 +1,44 @@ +[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE + +Backtrace support is only used for logging on signal errors, which +isn't really critical, so simply remove backtrace info if not +available in uClibc. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + src/log.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +Index: connman-0.78/src/log.c +=================================================================== +--- connman-0.78.orig/src/log.c ++++ connman-0.78/src/log.c +@@ -30,7 +30,12 @@ + #include <stdlib.h> + #include <string.h> + #include <syslog.h> ++#include <features.h> ++/* backtrace support is optional on uClibc */ ++#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__)) ++#define HAVE_BACKTRACE + #include <execinfo.h> ++#endif + #include <dlfcn.h> + + #include "connman.h" +@@ -112,6 +117,7 @@ + + static void print_backtrace(unsigned int offset) + { ++#ifdef HAVE_BACKTRACE + void *frames[99]; + size_t n_ptrs; + unsigned int i; +@@ -210,6 +216,7 @@ + + close(outfd[1]); + close(infd[0]); ++#endif /* HAVE_BACKTRACE */ + } + + static void signal_handler(int signo) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 6b9bbe67e..0aa7ec7b6 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,9 +4,9 @@ # ####################################################### -CONNMAN_VERSION = 0.78 -CONNMAN_SITE = git://git.kernel.org/pub/scm/network/connman/connman.git -CONNMAN_DEPENDENCIES = libglib2 dbus iptables +CONNMAN_VERSION = 1.0 +CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/ +CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls CONNMAN_INSTALL_STAGING = YES CONNMAN_CONF_OPT += --localstatedir=/var \ $(if $(BR2_PACKAGE_CONNMAN_THREADS),--enable-threads,--disable-threads) \ @@ -17,9 +17,6 @@ CONNMAN_CONF_OPT += --localstatedir=/var \ $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \ $(if $(BR2_PACKAGE_CONNMAN_NTPD),--enable-ntpd,--disable-ntpd) -# as long as sources are obtained from git, we need to generate the autofoo stuff -CONNMAN_AUTORECONF = YES - define CONNMAN_INSTALL_INITSCRIPT $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef |