diff options
Diffstat (limited to 'meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch')
-rw-r--r-- | meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch | 81 |
1 files changed, 0 insertions, 81 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 deleted file mode 100644 index da5756e9d5..0000000000 --- a/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | From 594b67df7ca923d13265906a71fbbf748273a5f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Mon, 23 Jan 2017 17:41:39 +0200 | ||
4 | Subject: [PATCH] Fix compile on musl with kernel 4.9 headers | ||
5 | |||
6 | Kernel headers break when musl defines IFF_LOWER_UP. While | ||
7 | waiting for more proper fix in musl, add a hack to connman. | ||
8 | |||
9 | Upstream-Status: Inappropriate [Workaround] | ||
10 | |||
11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
13 | --- | ||
14 | src/6to4.c | 4 ++++ | ||
15 | src/firewall-iptables.c | 4 ++++ | ||
16 | src/firewall-nftables.c | 3 +++ | ||
17 | src/iptables.c | 4 ++++ | ||
18 | 4 files changed, 15 insertions(+) | ||
19 | |||
20 | diff --git a/src/6to4.c b/src/6to4.c | ||
21 | index 71a2882..1938afb 100644 | ||
22 | --- a/src/6to4.c | ||
23 | +++ b/src/6to4.c | ||
24 | @@ -24,6 +24,10 @@ | ||
25 | #include <config.h> | ||
26 | #endif | ||
27 | |||
28 | +/* hack to make sure kernel headers understand that libc (musl) | ||
29 | + does define IFF_LOWER_UP et al. */ | ||
30 | +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 | ||
31 | + | ||
32 | #include <errno.h> | ||
33 | #include <stdio.h> | ||
34 | #include <stdlib.h> | ||
35 | diff --git a/src/firewall-iptables.c b/src/firewall-iptables.c | ||
36 | index 45943a8..e04bb91 100644 | ||
37 | --- a/src/firewall-iptables.c | ||
38 | +++ b/src/firewall-iptables.c | ||
39 | @@ -23,6 +23,10 @@ | ||
40 | #include <config.h> | ||
41 | #endif | ||
42 | |||
43 | +/* hack to make sure kernel headers understand that libc (musl) | ||
44 | + does define IFF_LOWER_UP et al. */ | ||
45 | +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 | ||
46 | + | ||
47 | #include <errno.h> | ||
48 | |||
49 | #include <xtables.h> | ||
50 | diff --git a/src/firewall-nftables.c b/src/firewall-nftables.c | ||
51 | index 2503ee2..583d1c4 100644 | ||
52 | --- a/src/firewall-nftables.c | ||
53 | +++ b/src/firewall-nftables.c | ||
54 | @@ -30,6 +30,9 @@ | ||
55 | #ifdef HAVE_CONFIG_H | ||
56 | #include <config.h> | ||
57 | #endif | ||
58 | +/* hack to make sure kernel headers understand that libc (musl) | ||
59 | + does define IFF_LOWER_UP et al. */ | ||
60 | +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 | ||
61 | |||
62 | #include <stdlib.h> | ||
63 | #include <time.h> | ||
64 | diff --git a/src/iptables.c b/src/iptables.c | ||
65 | index 82e3ac4..46ad9e2 100644 | ||
66 | --- a/src/iptables.c | ||
67 | +++ b/src/iptables.c | ||
68 | @@ -23,6 +23,10 @@ | ||
69 | #include <config.h> | ||
70 | #endif | ||
71 | |||
72 | +/* hack to make sure kernel headers understand that libc (musl) | ||
73 | + does define IFF_LOWER_UP et al. */ | ||
74 | +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 | ||
75 | + | ||
76 | #include <getopt.h> | ||
77 | #include <stdlib.h> | ||
78 | #include <stdio.h> | ||
79 | -- | ||
80 | 2.4.0 | ||
81 | |||