summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux-libc-headers
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/linux-libc-headers')
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch33
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch
new file mode 100644
index 0000000000..f2011880dc
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch
@@ -0,0 +1,33 @@
1From 017ae5929312685c4c044765445bfd4d2a4abb5c Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Mon, 3 Oct 2016 12:27:57 -0400
4Subject: [PATCH] if_tunnel: remove include of if/ip/in6.h
5
6commit 1fe8e0f074c [include/uapi/linux/if_tunnel.h: include linux/if.h, linux/ip.h and linux/in6.h]
7breaks the builds of net-tools.
8
9We remove the new includes until such a time that userspace can adapt to the
10new kernel headers.
11
12Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
13---
14 include/uapi/linux/if_tunnel.h | 3 ---
15 1 file changed, 3 deletions(-)
16
17diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
18index 777b6cd..1046f55 100644
19--- a/include/uapi/linux/if_tunnel.h
20+++ b/include/uapi/linux/if_tunnel.h
21@@ -2,9 +2,6 @@
22 #define _UAPI_IF_TUNNEL_H_
23
24 #include <linux/types.h>
25-#include <linux/if.h>
26-#include <linux/ip.h>
27-#include <linux/in6.h>
28 #include <asm/byteorder.h>
29
30
31--
322.7.4
33
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb
index 778f0b6e64..ee2d829345 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb
@@ -10,6 +10,7 @@ SRC_URI_append_libc-musl = "\
10 10
11SRC_URI_append = "\ 11SRC_URI_append = "\
12 file://0001-ppp-fix-in-if.h-includes.patch \ 12 file://0001-ppp-fix-in-if.h-includes.patch \
13 file://0001-if_tunnel-remove-include-of-if-ip-in6.h.patch \
13 " 14 "
14 15
15SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07" 16SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07"