diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2016-10-09 08:56:07 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-11 08:26:09 +0100 |
| commit | 94d15885c516e3bfee4fb68dfb568f4da6904052 (patch) | |
| tree | a84dce998039f403fd2fd5ffc965ce9b26a77beb /meta | |
| parent | 804bea398af3e3e3d134e5199eda61afbc285088 (diff) | |
| download | openembedded-core-94d15885c516e3bfee4fb68dfb568f4da6904052.tar.gz openembedded-core-94d15885c516e3bfee4fb68dfb568f4da6904052.tar.bz2 openembedded-core-94d15885c516e3bfee4fb68dfb568f4da6904052.zip | |
net-tools: fix building with linux-4.8
Fix a build error when using the linux-4.8 headers that results in:
In file included from
.../sysroots/qemuarm64/usr/include/linux/if_tunnel.h:6:0,
from iptunnel.c:39:
.../qemuarm64/usr/include/linux/ip.h:85:8: error: redefinition of
'struct iphdr'
struct iphdr {
^~~~~
In file included from iptunnel.c:29:0:
.../qemuarm64/usr/include/netinet/ip.h:44:8: note: originally defined here
struct iphdr
^~~~~
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch | 52 | ||||
| -rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 1 |
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch b/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch new file mode 100644 index 0000000000..505eeb048a --- /dev/null +++ b/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch @@ -0,0 +1,52 @@ +From 4d56645ea144a34f7cdd3e3ede6452d81fbae251 Mon Sep 17 00:00:00 2001 +From: Randy MacLeod <Randy.MacLeod@windriver.com> +Date: Sat, 8 Oct 2016 14:42:54 +0800 +Subject: [PATCH] iptunnel.c: include linux/ip.h to fix building with linux-4.8 + +Fix a build error when using the linux-4.8 headers that results in: + +In file included from +.../sysroots/qemuarm64/usr/include/linux/if_tunnel.h:6:0, + from iptunnel.c:39: +.../qemuarm64/usr/include/linux/ip.h:85:8: error: redefinition of +'struct iphdr' + struct iphdr { + ^~~~~ +In file included from iptunnel.c:29:0: +.../qemuarm64/usr/include/netinet/ip.h:44:8: note: originally defined here + struct iphdr + ^~~~~ + +Upstream-Status: Submitted [1] + +[1] https://sourceforge.net/p/net-tools/mailman/message/35413022/ + +Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + iptunnel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iptunnel.c b/iptunnel.c +index 4943d83..acfcbc7 100644 +--- a/iptunnel.c ++++ b/iptunnel.c +@@ -26,7 +26,6 @@ + #include <sys/socket.h> + #include <sys/ioctl.h> + #include <netinet/in.h> +-#include <netinet/ip.h> + #include <arpa/inet.h> + #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)) + #include <net/if.h> +@@ -36,6 +35,7 @@ + #include <linux/if_arp.h> + #endif + #include <linux/types.h> ++#include <linux/ip.h> + #include <linux/if_tunnel.h> + + #include "config.h" +-- +2.8.3 + diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 9c2adfa62e..47a68a59ac 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -16,6 +16,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/ file://net-tools-1.60-sctp2-quiet.patch \ file://net-tools-1.60-sctp3-addrs.patch \ file://0001-lib-inet6.c-INET6_rresolve-various-fixes.patch \ + file://net-tools-fix-building-with-linux-4.8.patch \ " # for this package we're mostly interested in tracking debian patches, |