diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2016-10-09 08:56:06 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-11 08:26:09 +0100 |
| commit | 804bea398af3e3e3d134e5199eda61afbc285088 (patch) | |
| tree | 7e67f2aefe491830565be85f93e16d0bc391b57c | |
| parent | 66d4efeb0face5fc8a1755dcd2ed3a611997a04d (diff) | |
| download | openembedded-core-804bea398af3e3e3d134e5199eda61afbc285088.tar.gz openembedded-core-804bea398af3e3e3d134e5199eda61afbc285088.tar.bz2 openembedded-core-804bea398af3e3e3d134e5199eda61afbc285088.zip | |
Revert "linux-libc-headers: if_tunnel: remove include of if/ip/in6.h"
The issue is fixed in net-tools.
This reverts commit fb71f34d7379569c23cc00e18d134093147613f5.
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.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb | 1 |
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 @@ -From 017ae5929312685c4c044765445bfd4d2a4abb5c Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Mon, 3 Oct 2016 12:27:57 -0400 -Subject: [PATCH] if_tunnel: remove include of if/ip/in6.h - -commit 1fe8e0f074c [include/uapi/linux/if_tunnel.h: include linux/if.h, linux/ip.h and linux/in6.h] -breaks the builds of net-tools. - -We remove the new includes until such a time that userspace can adapt to the -new kernel headers. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - include/uapi/linux/if_tunnel.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index 777b6cd..1046f55 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -2,9 +2,6 @@ - #define _UAPI_IF_TUNNEL_H_ - - #include <linux/types.h> --#include <linux/if.h> --#include <linux/ip.h> --#include <linux/in6.h> - #include <asm/byteorder.h> - - --- -2.7.4 - 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 = "\ SRC_URI_append = "\ file://0001-ppp-fix-in-if.h-includes.patch \ - file://0001-if_tunnel-remove-include-of-if-ip-in6.h.patch \ " SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07" |