summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch20
-rw-r--r--meta/recipes-connectivity/connman/connman_1.13.bb (renamed from meta/recipes-connectivity/connman/connman_1.12.bb)6
2 files changed, 3 insertions, 23 deletions
diff --git a/meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch b/meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch
deleted file mode 100644
index 8ee0b6f543..0000000000
--- a/meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-The 3.8 Kernel headers for if_bridge.h uses the in6_addr struct
-which is defined by netinet/in.h which is not included prior.
-
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: git/src/tethering.c
-===================================================================
---- git.orig/src/tethering.c
-+++ git/src/tethering.c
-@@ -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/meta/recipes-connectivity/connman/connman_1.12.bb b/meta/recipes-connectivity/connman/connman_1.13.bb
index 5ba4032c45..4f235382ff 100644
--- a/meta/recipes-connectivity/connman/connman_1.12.bb
+++ b/meta/recipes-connectivity/connman/connman_1.13.bb
@@ -1,13 +1,13 @@
require connman.inc
-# 1.12 tag
-SRCREV = "8397cbbc0a79d39cf3b1880f4fd3f3405b6bc6ad"
+# 1.13 tag
+SRCREV = "96fcd8871531c9012135110769618d65a3523b4d"
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
file://add_xuser_dbus_permission.patch \
file://connman \
file://inet-fix-ip-cleanup-functions.patch \
- file://add-in.h-for-ipv6.patch"
+ "
S = "${WORKDIR}/git"
PR = "${INC_PR}.0"