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
         ^~~~~
(From OE-Core rev: 94d15885c516e3bfee4fb68dfb568f4da6904052)

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>
This commit is contained in:
Jackie Huang
2016-10-09 08:56:07 +08:00
committed by Richard Purdie
parent 40f262f9de
commit 0f25619268
2 changed files with 53 additions and 0 deletions

View File

@@ -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

View File

@@ -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,