summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Mitchell <jack.mitchell@dbbroadcast.co.uk>2013-04-24 15:26:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-29 14:43:51 +0100
commit04c119d36f2a6157ba3a86106e555e79739961b6 (patch)
tree630089ac851cf8067a0b8e6fb619be631bf147d9
parentb2e2c6e1a20ea4c53dea04992bb1b38890a959dd (diff)
downloadopenembedded-core-04c119d36f2a6157ba3a86106e555e79739961b6.tar.gz
openembedded-core-04c119d36f2a6157ba3a86106e555e79739961b6.tar.bz2
openembedded-core-04c119d36f2a6157ba3a86106e555e79739961b6.zip
connman: update to 1.13
- Removed upstream commited patch - Updated git tag srcrev Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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"