summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2013-03-23 22:26:25 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-03-24 11:42:01 (GMT)
commit3f251aa5b93be64ba61edeea93e5822962cebf39 (patch)
treee9401125981aa86c36aea396383aa660e3703acc
parent8af2f091aba3d9521c09b086785c6fc8db51cc91 (diff)
downloadbuildroot-3f251aa5b93be64ba61edeea93e5822962cebf39.tar.gz
buildroot-3f251aa5b93be64ba61edeea93e5822962cebf39.tar.bz2
package/connman: version bump to 1.12, and fix build with newer kernels headers
... while keeping compatibility with older ones. Fixes autobuild failure: http://autobuild.buildroot.org/results/f99ae7af46c70f7c356b7771321511a42eb3694d/ Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/connman/connman-000-uclibc-backtrace.patch (renamed from package/connman/connman-uclibc-backtrace.patch)0
-rw-r--r--package/connman/connman-001-fix-for-latest-headers-3.8+.patch19
-rw-r--r--package/connman/connman.mk2
3 files changed, 20 insertions, 1 deletions
diff --git a/package/connman/connman-uclibc-backtrace.patch b/package/connman/connman-000-uclibc-backtrace.patch
index 4b806c6..4b806c6 100644
--- a/package/connman/connman-uclibc-backtrace.patch
+++ b/package/connman/connman-000-uclibc-backtrace.patch
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
new file mode 100644
index 0000000..ef1fabc
--- /dev/null
+++ b/package/connman/connman-001-fix-for-latest-headers-3.8+.patch
@@ -0,0 +1,19 @@
+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 bb528b4..f29ff3b 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
#
#######################################################
-CONNMAN_VERSION = 1.11
+CONNMAN_VERSION = 1.12
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
CONNMAN_INSTALL_STAGING = YES