diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
commit | bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch) | |
tree | d6012109e704c5e9abc709c23a7133a3d4b4f779 /package/connman/Config.in | |
parent | 5b11223fb6cd0469becf49b0986868832c076bfc (diff) | |
parent | 2105ecbd86d04e446effa11108f6bd755ed5f19a (diff) | |
download | buildroot-novena-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.gz buildroot-novena-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.zip |
Merge branch 'next'
Conflicts:
toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/connman/Config.in')
-rw-r--r-- | package/connman/Config.in | 5 |
1 files changed, 3 insertions, 2 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 |