summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-01-23 16:00:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-26 10:44:28 (GMT)
commit6a315883b811ca765fc6697a5c5c3f71a294dc4c (patch)
tree5d933d387da854c8d83dee4fda06a3e2990668d0 /meta/recipes-connectivity/connman
parenta02f7f2a33a4bf4038ab3a66893981a8ebaa5a9f (diff)
downloadpoky-6a315883b811ca765fc6697a5c5c3f71a294dc4c.tar.gz
connman: Add workaround to build with musl & 4.9 headers
Kernel headers break when musl defines IFF_LOWER_UP. While waiting for more proper fix in musl, add a workaround to connman. (From OE-Core rev: e6178138968717e1bdb7af7b5aed42fc74d956ab) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch64
-rw-r--r--meta/recipes-connectivity/connman/connman_1.33.bb3
2 files changed, 66 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch b/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch
new file mode 100644
index 0000000..bf3b86d
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch
@@ -0,0 +1,64 @@
1From c8bfad4ee9d2c505c00ccbb8b2139543b5ad6fcb Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 23 Jan 2017 17:41:39 +0200
4Subject: [PATCH] Fix compile on musl with kernel 4.9 headers
5
6Kernel headers break when musl defines IFF_LOWER_UP. While
7waiting for more proper fix in musl, add a hack to connman.
8
9Upstream-Status: Inappropriate [Workaround]
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11---
12 src/6to4.c | 4 ++++
13 src/firewall.c | 4 ++++
14 src/iptables.c | 4 ++++
15 3 files changed, 12 insertions(+)
16
17diff --git a/src/6to4.c b/src/6to4.c
18index 71a2882..1938afb 100644
19--- a/src/6to4.c
20+++ b/src/6to4.c
21@@ -24,6 +24,10 @@
22 #include <config.h>
23 #endif
24
25+/* hack to make sure kernel headers understand that libc (musl)
26+ does define IFF_LOWER_UP et al. */
27+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
28+
29 #include <errno.h>
30 #include <stdio.h>
31 #include <stdlib.h>
32diff --git a/src/firewall.c b/src/firewall.c
33index c440df6..c83def9 100644
34--- a/src/firewall.c
35+++ b/src/firewall.c
36@@ -23,6 +23,10 @@
37 #include <config.h>
38 #endif
39
40+/* hack to make sure kernel headers understand that libc (musl)
41+ does define IFF_LOWER_UP et al. */
42+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
43+
44 #include <errno.h>
45
46 #include <xtables.h>
47diff --git a/src/iptables.c b/src/iptables.c
48index 82e3ac4..46ad9e2 100644
49--- a/src/iptables.c
50+++ b/src/iptables.c
51@@ -23,6 +23,10 @@
52 #include <config.h>
53 #endif
54
55+/* hack to make sure kernel headers understand that libc (musl)
56+ does define IFF_LOWER_UP et al. */
57+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
58+
59 #include <getopt.h>
60 #include <stdlib.h>
61 #include <stdio.h>
62--
632.1.4
64
diff --git a/meta/recipes-connectivity/connman/connman_1.33.bb b/meta/recipes-connectivity/connman/connman_1.33.bb
index 56a0a0f..4129b05 100644
--- a/meta/recipes-connectivity/connman/connman_1.33.bb
+++ b/meta/recipes-connectivity/connman/connman_1.33.bb
@@ -7,7 +7,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
7 file://includes.patch \ 7 file://includes.patch \
8 file://0003-stats-Fix-bad-file-descriptor-initialisation.patch \ 8 file://0003-stats-Fix-bad-file-descriptor-initialisation.patch \
9 " 9 "
10SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch" 10SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch \
11 file://0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch"
11 12
12SRC_URI[md5sum] = "c51903fd3e7a6a371d12ac5d72a1fa01" 13SRC_URI[md5sum] = "c51903fd3e7a6a371d12ac5d72a1fa01"
13SRC_URI[sha256sum] = "bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0" 14SRC_URI[sha256sum] = "bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0"