summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-10-14 08:50:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-15 10:01:43 +0100
commit21d5c58a1e8832105116c20732635c89ac25cae8 (patch)
treeb2b3839099d56a299931b48bc43cce328b5e148c
parentb2726f75159900f513bc70d3de7a1923ce8f9f2b (diff)
downloadpoky-21d5c58a1e8832105116c20732635c89ac25cae8.tar.gz
Revert "linux-libc-headers: fix in/if.h includes"
This issue is fixed in the ppp recipe. This reverts commit 7c6b78ac8e2b176f77178c3dd12d8455be10845d. (From OE-Core rev: efc92a63d40b909864505d3d6d22ce74cd6a847b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch83
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb4
2 files changed, 0 insertions, 87 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch
deleted file mode 100644
index f31a53946e..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
1From 80f3064c378f8c919aa6450bd7833a154c184f7f Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Mon, 3 Oct 2016 01:18:13 -0400
4Subject: [PATCH] ppp: fix in/if.h includes
5
6The following kernel commits broke the compilation of ppp, due to redefined
7structures.
8
9Nothing else breaks in userspace with or without these uapi changes, so we
10revert them to keep everything building.
11
12 commit 05ee5de7451796cf9a8aeb2f05a57790d4fd2336
13 Author: Mikko Rapeli <mikko.rapeli@iki.fi>
14 Date: Mon Aug 22 20:32:42 2016 +0200
15
16 include/uapi/linux/if_pppol2tp.h: include linux/in.h and linux/in6.h
17
18 Fixes userspace compilation errors like:
19
20 error: field <E2><80><98>addr<E2><80><99> has incomplete type
21 struct sockaddr_in addr; /* IP address and port to send to */
22 ^
23 error: field <E2><80><98>addr<E2><80><99> has incomplete type
24 struct sockaddr_in6 addr; /* IP address and port to send to */
25
26 Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
27 Signed-off-by: David S. Miller <davem@davemloft.net>
28
29 commit eafe92114308acf14e45c6c3d154a5dad5523d1a
30 Author: Mikko Rapeli <mikko.rapeli@iki.fi>
31 Date: Mon Aug 22 20:32:43 2016 +0200
32
33 include/uapi/linux/if_pppox.h: include linux/in.h and linux/in6.h
34
35 Fixes userspace compilation errors:
36
37 error: field <E2><80><98>addr<E2><80><99> has incomplete type
38 struct sockaddr_in addr; /* IP address and port to send to */
39
40 error: field <E2><80><98>addr<E2><80><99> has incomplete type
41 struct sockaddr_in6 addr; /* IP address and port to send to */
42
43 Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
44 Signed-off-by: David S. Miller <davem@davemloft.net>
45
46Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
47---
48 include/uapi/linux/if_pppol2tp.h | 2 --
49 include/uapi/linux/if_pppox.h | 3 ---
50 2 files changed, 5 deletions(-)
51
52diff --git a/include/uapi/linux/if_pppol2tp.h b/include/uapi/linux/if_pppol2tp.h
53index 4bd1f55..ca559c6 100644
54--- a/include/uapi/linux/if_pppol2tp.h
55+++ b/include/uapi/linux/if_pppol2tp.h
56@@ -16,8 +16,6 @@
57 #define _UAPI__LINUX_IF_PPPOL2TP_H
58
59 #include <linux/types.h>
60-#include <linux/in.h>
61-#include <linux/in6.h>
62
63 /* Structure used to connect() the socket to a particular tunnel UDP
64 * socket over IPv4.
65diff --git a/include/uapi/linux/if_pppox.h b/include/uapi/linux/if_pppox.h
66index d37bbb1..e128769 100644
67--- a/include/uapi/linux/if_pppox.h
68+++ b/include/uapi/linux/if_pppox.h
69@@ -21,11 +21,8 @@
70 #include <asm/byteorder.h>
71
72 #include <linux/socket.h>
73-#include <linux/if.h>
74 #include <linux/if_ether.h>
75 #include <linux/if_pppol2tp.h>
76-#include <linux/in.h>
77-#include <linux/in6.h>
78
79 /* For user-space programs to pick up these definitions
80 * which they wouldn't get otherwise without defining __KERNEL__
81--
822.7.4
83
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 778f0b6e64..77e0870d32 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
@@ -8,9 +8,5 @@ SRC_URI_append_libc-musl = "\
8 file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ 8 file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
9 " 9 "
10 10
11SRC_URI_append = "\
12 file://0001-ppp-fix-in-if.h-includes.patch \
13 "
14
15SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07" 11SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07"
16SRC_URI[sha256sum] = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a" 12SRC_URI[sha256sum] = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a"