diff options
-rw-r--r-- | meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch | 20 | ||||
-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 @@ | |||
1 | |||
2 | The 3.8 Kernel headers for if_bridge.h uses the in6_addr struct | ||
3 | which is defined by netinet/in.h which is not included prior. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
8 | |||
9 | Index: git/src/tethering.c | ||
10 | =================================================================== | ||
11 | --- git.orig/src/tethering.c | ||
12 | +++ git/src/tethering.c | ||
13 | @@ -35,6 +35,7 @@ | ||
14 | #include <string.h> | ||
15 | #include <fcntl.h> | ||
16 | #include <linux/if_tun.h> | ||
17 | +#include <netinet/in.h> | ||
18 | #include <linux/if_bridge.h> | ||
19 | |||
20 | #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 @@ | |||
1 | require connman.inc | 1 | require connman.inc |
2 | 2 | ||
3 | # 1.12 tag | 3 | # 1.13 tag |
4 | SRCREV = "8397cbbc0a79d39cf3b1880f4fd3f3405b6bc6ad" | 4 | SRCREV = "96fcd8871531c9012135110769618d65a3523b4d" |
5 | SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ | 5 | SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ |
6 | file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ | 6 | file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ |
7 | file://add_xuser_dbus_permission.patch \ | 7 | file://add_xuser_dbus_permission.patch \ |
8 | file://connman \ | 8 | file://connman \ |
9 | file://inet-fix-ip-cleanup-functions.patch \ | 9 | file://inet-fix-ip-cleanup-functions.patch \ |
10 | file://add-in.h-for-ipv6.patch" | 10 | " |
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | PR = "${INC_PR}.0" | 12 | PR = "${INC_PR}.0" |
13 | 13 | ||