summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-10-09 08:56:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-11 08:27:27 +0100
commit0f25619268d4eb4e4a40cac7cdb40de5bca9ade1 (patch)
tree66b0332b9da4bcf6e5b9920900bf5677077af521
parent40f262f9de3cb49c994d920085011ad0740a5190 (diff)
downloadpoky-0f25619268d4eb4e4a40cac7cdb40de5bca9ade1.tar.gz
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>
-rw-r--r--meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch52
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-26.bb1
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 @@
1From 4d56645ea144a34f7cdd3e3ede6452d81fbae251 Mon Sep 17 00:00:00 2001
2From: Randy MacLeod <Randy.MacLeod@windriver.com>
3Date: Sat, 8 Oct 2016 14:42:54 +0800
4Subject: [PATCH] iptunnel.c: include linux/ip.h to fix building with linux-4.8
5
6Fix a build error when using the linux-4.8 headers that results in:
7
8In file included from
9.../sysroots/qemuarm64/usr/include/linux/if_tunnel.h:6:0,
10 from iptunnel.c:39:
11.../qemuarm64/usr/include/linux/ip.h:85:8: error: redefinition of
12'struct iphdr'
13 struct iphdr {
14 ^~~~~
15In file included from iptunnel.c:29:0:
16.../qemuarm64/usr/include/netinet/ip.h:44:8: note: originally defined here
17 struct iphdr
18 ^~~~~
19
20Upstream-Status: Submitted [1]
21
22[1] https://sourceforge.net/p/net-tools/mailman/message/35413022/
23
24Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
25Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
26---
27 iptunnel.c | 2 +-
28 1 file changed, 1 insertion(+), 1 deletion(-)
29
30diff --git a/iptunnel.c b/iptunnel.c
31index 4943d83..acfcbc7 100644
32--- a/iptunnel.c
33+++ b/iptunnel.c
34@@ -26,7 +26,6 @@
35 #include <sys/socket.h>
36 #include <sys/ioctl.h>
37 #include <netinet/in.h>
38-#include <netinet/ip.h>
39 #include <arpa/inet.h>
40 #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
41 #include <net/if.h>
42@@ -36,6 +35,7 @@
43 #include <linux/if_arp.h>
44 #endif
45 #include <linux/types.h>
46+#include <linux/ip.h>
47 #include <linux/if_tunnel.h>
48
49 #include "config.h"
50--
512.8.3
52
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/
16 file://net-tools-1.60-sctp2-quiet.patch \ 16 file://net-tools-1.60-sctp2-quiet.patch \
17 file://net-tools-1.60-sctp3-addrs.patch \ 17 file://net-tools-1.60-sctp3-addrs.patch \
18 file://0001-lib-inet6.c-INET6_rresolve-various-fixes.patch \ 18 file://0001-lib-inet6.c-INET6_rresolve-various-fixes.patch \
19 file://net-tools-fix-building-with-linux-4.8.patch \
19 " 20 "
20 21
21# for this package we're mostly interested in tracking debian patches, 22# for this package we're mostly interested in tracking debian patches,