summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-10-09 08:56:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-11 08:27:27 +0100
commit40f262f9de3cb49c994d920085011ad0740a5190 (patch)
tree05ca03b4ebad49f0045e9837a1e13eb11fe89cc7
parenta8efeb7df33d323e1f7f800918835689edac55d6 (diff)
downloadpoky-40f262f9de3cb49c994d920085011ad0740a5190.tar.gz
Revert "linux-libc-headers: if_tunnel: remove include of if/ip/in6.h"
The issue is fixed in net-tools. This reverts commit fb71f34d7379569c23cc00e18d134093147613f5. (From OE-Core rev: 804bea398af3e3e3d134e5199eda61afbc285088) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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, 0 insertions, 34 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
deleted file mode 100644
index f2011880dc..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
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 ee2d829345..778f0b6e64 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,7 +10,6 @@ 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 \
14 " 13 "
15 14
16SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07" 15SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07"