mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-06 15:29:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

linux-libc-headers: Refresh musl patches against newer kernel headers version

Browse Source 
The musl patches need to be updated against the latest kernel verison
in order to apply. No functionality changes.

(From OE-Core rev: b9dd65b99ecf2ccbac3649cf4449fdba3f25a272)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-08-31 08:30:35 +01:00
parent ab338be9e3
commit 98d57df225
3 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
View File

@@ -11,10 +11,10 @@ Upstream-Status: Submitted
include/uapi/linux/libc-compat.h | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
Index: linux-4.4/include/uapi/linux/libc-compat.h
Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
===================================================================
--- linux-4.4.orig/include/uapi/linux/libc-compat.h
+++ linux-4.4/include/uapi/linux/libc-compat.h
--- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h
+++ linux-4.8-rc4/include/uapi/linux/libc-compat.h
@@ -48,13 +48,12 @@
#ifndef _UAPI_LIBC_COMPAT_H
#define _UAPI_LIBC_COMPAT_H
@@ -23,16 +23,17 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h
-#if defined(__GLIBC__)
+#ifndef __KERNEL__ /* we're used from userspace */
-/* Coordinate with glibc netinet/in.h header. */
+/* Coordinate with libc netinet/in.h header. */
#if defined(_NETINET_IN_H)
-/* Coordinate with glibc net/if.h header. */
-#if defined(_NET_IF_H) && defined(__USE_MISC)
+/* Coordinate with libc net/if.h header. */
+#if defined(_NET_IF_H)
-/* GLIBC headers included first so don't define anything
+/* LIBC headers included first so don't define anything
* that would already be defined. */
#define __UAPI_DEF_IN_ADDR 0
#define __UAPI_DEF_IN_IPPROTO 0
@@ -64,15 +63,7 @@
#define __UAPI_DEF_IF_IFCONF 0
@@ -98,15 +97,7 @@
#define __UAPI_DEF_IN_CLASS 0
#define __UAPI_DEF_IN6_ADDR 0
@@ -48,7 +49,7 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h
#define __UAPI_DEF_SOCKADDR_IN6 0
#define __UAPI_DEF_IPV6_MREQ 0
#define __UAPI_DEF_IPPROTO_V6 0
@@ -80,10 +71,10 @@
@@ -114,10 +105,10 @@
#define __UAPI_DEF_IN6_PKTINFO 0
#define __UAPI_DEF_IP6_MTUINFO 0
@@ -61,7 +62,7 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h
* __UAPI_DEF_* defines and adjust appropriately. */
#define __UAPI_DEF_IN_ADDR 1
#define __UAPI_DEF_IN_IPPROTO 1
@@ -93,7 +84,7 @@
@@ -127,7 +118,7 @@
#define __UAPI_DEF_IN_CLASS 1
#define __UAPI_DEF_IN6_ADDR 1
@@ -70,16 +71,16 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h
* coordinate. */
#define __UAPI_DEF_IN6_ADDR_ALT 1
#define __UAPI_DEF_SOCKADDR_IN6 1
@@ -115,7 +106,7 @@
@@ -149,7 +140,7 @@
/* If we did not see any headers from any supported C libraries,
* or we are being included in the kernel, then define everything
* that we need. */
-#else /* !defined(__GLIBC__) */
+#else /* __KERNEL__ */
/* Definitions for in.h */
#define __UAPI_DEF_IN_ADDR 1
@@ -138,6 +129,6 @@
/* Definitions for if.h */
#define __UAPI_DEF_IF_IFCONF 1
@@ -182,6 +173,6 @@
/* Definitions for xattr.h */
#define __UAPI_DEF_XATTR 1

25
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
View File

@@ -11,10 +11,10 @@ Upstream-Status: Submitted
include/uapi/linux/libc-compat.h | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
index aa63ed0..e94da57 100644
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
Index: linux-4.8-rc4/include/uapi/linux/if_ether.h
===================================================================
--- linux-4.8-rc4.orig/include/uapi/linux/if_ether.h
+++ linux-4.8-rc4/include/uapi/linux/if_ether.h
@@ -22,6 +22,7 @@
#define _UAPI_LINUX_IF_ETHER_H
@@ -23,7 +23,7 @@ index aa63ed0..e94da57 100644
/*
* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
@@ -134,11 +135,12 @@
@@ -138,11 +139,12 @@
* This is an Ethernet frame header.
*/
@@ -37,10 +37,10 @@ index aa63ed0..e94da57 100644
+#endif
#endif /* _UAPI_LINUX_IF_ETHER_H */
diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
index afe15c2..7d0c78a 100644
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
===================================================================
--- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h
+++ linux-4.8-rc4/include/uapi/linux/libc-compat.h
@@ -50,6 +50,12 @@
#ifndef __KERNEL__ /* we're used from userspace */
@@ -51,9 +51,6 @@ index afe15c2..7d0c78a 100644
+#define __UAPI_DEF_ETHHDR 1
+#endif
+
/* Coordinate with libc netinet/in.h header. */
#if defined(_NETINET_IN_H)
/* Coordinate with libc net/if.h header. */
#if defined(_NET_IF_H) && defined(__USE_MISC)
--
2.6.4

11
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
View File

@@ -13,10 +13,10 @@ Upstream-Status: Submitted
include/uapi/linux/kernel.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
index 321e399..e8ff821 100644
--- a/include/uapi/linux/kernel.h
+++ b/include/uapi/linux/kernel.h
Index: linux-4.8-rc4/include/uapi/linux/kernel.h
===================================================================
--- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
+++ linux-4.8-rc4/include/uapi/linux/kernel.h
@@ -1,7 +1,9 @@
#ifndef _UAPI_LINUX_KERNEL_H
#define _UAPI_LINUX_KERNEL_H
@@ -27,6 +27,3 @@ index 321e399..e8ff821 100644
/*
* 'kernel.h' contains some often-used function prototypes etc
--
2.6.4