Revert "linux-libc-headers: fix in/if.h includes"

This issue is fixed in the ppp recipe.

This reverts commit 7c6b78ac8e2b176f77178c3dd12d8455be10845d.

Signed-off-by: Ross Burton <ross.burton@intel.com>

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 (file)
index f31a539..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 80f3064c378f8c919aa6450bd7833a154c184f7f Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Mon, 3 Oct 2016 01:18:13 -0400
-Subject: [PATCH] ppp: fix in/if.h includes
-
-The following kernel commits broke the compilation of ppp, due to redefined
-structures.
-
-Nothing else breaks in userspace with or without these uapi changes, so we
-revert them to keep everything building.
-                    
-   commit 05ee5de7451796cf9a8aeb2f05a57790d4fd2336
-   Author: Mikko Rapeli <mikko.rapeli@iki.fi>
-   Date:   Mon Aug 22 20:32:42 2016 +0200
-
-       include/uapi/linux/if_pppol2tp.h: include linux/in.h and linux/in6.h
-
-       Fixes userspace compilation errors like:
-
-       error: field <E2><80><98>addr<E2><80><99> has incomplete type
-       struct sockaddr_in addr; /* IP address and port to send to */
-                          ^
-       error: field <E2><80><98>addr<E2><80><99> has incomplete type
-       struct sockaddr_in6 addr; /* IP address and port to send to */
-
-       Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
-       Signed-off-by: David S. Miller <davem@davemloft.net>
-
-   commit eafe92114308acf14e45c6c3d154a5dad5523d1a
-   Author: Mikko Rapeli <mikko.rapeli@iki.fi>
-   Date:   Mon Aug 22 20:32:43 2016 +0200
-
-       include/uapi/linux/if_pppox.h: include linux/in.h and linux/in6.h
-
-       Fixes userspace compilation errors:
-
-       error: field <E2><80><98>addr<E2><80><99> has incomplete type
-       struct sockaddr_in addr; /* IP address and port to send to */
-
-       error: field <E2><80><98>addr<E2><80><99> has incomplete type
-       struct sockaddr_in6 addr; /* IP address and port to send to */
-
-       Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
-       Signed-off-by: David S. Miller <davem@davemloft.net>
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- include/uapi/linux/if_pppol2tp.h | 2 --
- include/uapi/linux/if_pppox.h    | 3 ---
- 2 files changed, 5 deletions(-)
-
-diff --git a/include/uapi/linux/if_pppol2tp.h b/include/uapi/linux/if_pppol2tp.h
-index 4bd1f55..ca559c6 100644
---- a/include/uapi/linux/if_pppol2tp.h
-+++ b/include/uapi/linux/if_pppol2tp.h
-@@ -16,8 +16,6 @@
- #define _UAPI__LINUX_IF_PPPOL2TP_H
- 
- #include <linux/types.h>
--#include <linux/in.h>
--#include <linux/in6.h>
- 
- /* Structure used to connect() the socket to a particular tunnel UDP
-  * socket over IPv4.
-diff --git a/include/uapi/linux/if_pppox.h b/include/uapi/linux/if_pppox.h
-index d37bbb1..e128769 100644
---- a/include/uapi/linux/if_pppox.h
-+++ b/include/uapi/linux/if_pppox.h
-@@ -21,11 +21,8 @@
- #include <asm/byteorder.h>
- 
- #include <linux/socket.h>
--#include <linux/if.h>
- #include <linux/if_ether.h>
- #include <linux/if_pppol2tp.h>
--#include <linux/in.h>
--#include <linux/in6.h>
- 
- /* For user-space programs to pick up these definitions
-  * which they wouldn't get otherwise without defining __KERNEL__
--- 
-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 778f0b6e6443490dd057f6468cd385c45c33fcf9..77e0870d326f4d0c3b935d454b780b2eef127140 100644 (file)
--- 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 = "\
     file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
    "
 
-SRC_URI_append = "\
-    file://0001-ppp-fix-in-if.h-includes.patch \
-    "
-
 SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07"
 SRC_URI[sha256sum] = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a"