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 | 37 |
1 files changed, 27 insertions, 10 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 index bf3b86d863..da5756e9d5 100644 --- 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 @@ -1,4 +1,4 @@ -From c8bfad4ee9d2c505c00ccbb8b2139543b5ad6fcb Mon Sep 17 00:00:00 2001 +From 594b67df7ca923d13265906a71fbbf748273a5f5 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Mon, 23 Jan 2017 17:41:39 +0200 Subject: [PATCH] Fix compile on musl with kernel 4.9 headers @@ -7,12 +7,15 @@ Kernel headers break when musl defines IFF_LOWER_UP. While waiting for more proper fix in musl, add a hack to connman. Upstream-Status: Inappropriate [Workaround] + Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> --- - src/6to4.c | 4 ++++ - src/firewall.c | 4 ++++ - src/iptables.c | 4 ++++ - 3 files changed, 12 insertions(+) + src/6to4.c | 4 ++++ + src/firewall-iptables.c | 4 ++++ + src/firewall-nftables.c | 3 +++ + src/iptables.c | 4 ++++ + 4 files changed, 15 insertions(+) diff --git a/src/6to4.c b/src/6to4.c index 71a2882..1938afb 100644 @@ -29,10 +32,10 @@ index 71a2882..1938afb 100644 #include <errno.h> #include <stdio.h> #include <stdlib.h> -diff --git a/src/firewall.c b/src/firewall.c -index c440df6..c83def9 100644 ---- a/src/firewall.c -+++ b/src/firewall.c +diff --git a/src/firewall-iptables.c b/src/firewall-iptables.c +index 45943a8..e04bb91 100644 +--- a/src/firewall-iptables.c ++++ b/src/firewall-iptables.c @@ -23,6 +23,10 @@ #include <config.h> #endif @@ -44,6 +47,20 @@ index c440df6..c83def9 100644 #include <errno.h> #include <xtables.h> +diff --git a/src/firewall-nftables.c b/src/firewall-nftables.c +index 2503ee2..583d1c4 100644 +--- a/src/firewall-nftables.c ++++ b/src/firewall-nftables.c +@@ -30,6 +30,9 @@ + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif ++/* hack to make sure kernel headers understand that libc (musl) ++ does define IFF_LOWER_UP et al. */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + + #include <stdlib.h> + #include <time.h> diff --git a/src/iptables.c b/src/iptables.c index 82e3ac4..46ad9e2 100644 --- a/src/iptables.c @@ -60,5 +77,5 @@ index 82e3ac4..46ad9e2 100644 #include <stdlib.h> #include <stdio.h> -- -2.1.4 +2.4.0 |