mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

linux-libc-headers: update to v4.15

Browse Source 
(From OE-Core rev: ef96628d850f1154c7e59bca418ef3a7c9a2bcc1)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2018-02-06 11:21:54 -05:00
committed by Richard Purdie
parent 48c94077ff
commit 9c3b84d5ee
4 changed files with 23 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/distro/include/tcmode-default.inc
View File

@@ -27,7 +27,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.29%"
GDBVERSION ?= "8.0%"
GLIBCVERSION ?= "2.26%"
LINUXLIBCVERSION ?= "4.14%"
LINUXLIBCVERSION ?= "4.15%"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"

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

@@ -11,11 +11,11 @@ Upstream-Status: Submitted
include/uapi/linux/libc-compat.h | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
Index: linux-4.15/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 @@
--- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:37:44.724314379 -0500
+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:38:02.148913820 -0500
@@ -49,13 +49,12 @@
#ifndef _UAPI_LIBC_COMPAT_H
#define _UAPI_LIBC_COMPAT_H
@@ -33,7 +33,7 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
* that would already be defined. */
#define __UAPI_DEF_IF_IFCONF 0
@@ -98,15 +97,7 @@
@@ -99,15 +98,7 @@
#define __UAPI_DEF_IN_CLASS 0
#define __UAPI_DEF_IN6_ADDR 0
@@ -49,7 +49,7 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
#define __UAPI_DEF_SOCKADDR_IN6 0
#define __UAPI_DEF_IPV6_MREQ 0
#define __UAPI_DEF_IPPROTO_V6 0
@@ -114,10 +105,10 @@
@@ -115,10 +106,10 @@
#define __UAPI_DEF_IN6_PKTINFO 0
#define __UAPI_DEF_IP6_MTUINFO 0
@@ -62,7 +62,7 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
* __UAPI_DEF_* defines and adjust appropriately. */
#define __UAPI_DEF_IN_ADDR 1
#define __UAPI_DEF_IN_IPPROTO 1
@@ -127,7 +118,7 @@
@@ -128,7 +119,7 @@
#define __UAPI_DEF_IN_CLASS 1
#define __UAPI_DEF_IN6_ADDR 1
@@ -71,20 +71,21 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
* coordinate. */
#define __UAPI_DEF_IN6_ADDR_ALT 1
#define __UAPI_DEF_SOCKADDR_IN6 1
@@ -149,7 +140,7 @@
/* If we did not see any headers from any supported C libraries,
@@ -170,7 +161,7 @@
* or we are being included in the kernel, then define everything
* that we need. */
* that we need. Check for previous __UAPI_* definitions to give
* unsupported C libraries a way to opt out of any kernel definition. */
-#else /* !defined(__GLIBC__) */
+#else /* __KERNEL__ */
/* Definitions for if.h */
#define __UAPI_DEF_IF_IFCONF 1
@@ -182,6 +173,6 @@
/* Definitions for xattr.h */
#ifndef __UAPI_DEF_IF_IFCONF
@@ -262,7 +253,7 @@
#define __UAPI_DEF_XATTR 1
#endif
-#endif /* __GLIBC__ */
+#endif /* __KERNEL__ */
#endif /* _UAPI_LIBC_COMPAT_H */
/* Definitions for if_ether.h */
/* allow libcs like musl to deactivate this, glibc does not implement this. */

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

@@ -11,37 +11,11 @@ Upstream-Status: Submitted
include/uapi/linux/libc-compat.h | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)
Index: linux-4.8-rc4/include/uapi/linux/if_ether.h
Index: linux-4.15/include/uapi/linux/libc-compat.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
#include <linux/types.h>
+#include <linux/libc-compat.h>
/*
* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
@@ -138,11 +139,12 @@
* This is an Ethernet frame header.
*/
+#if __UAPI_DEF_ETHHDR
struct ethhdr {
unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
unsigned char h_source[ETH_ALEN]; /* source ether addr */
__be16 h_proto; /* packet type ID field */
} __attribute__((packed));
-
+#endif
#endif /* _UAPI_LINUX_IF_ETHER_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 @@
--- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500
+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500
@@ -51,6 +51,12 @@
#ifndef __KERNEL__ /* we're used from userspace */
@@ -52,5 +26,5 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
+#endif
+
/* Coordinate with libc net/if.h header. */
#if defined(_NET_IF_H) && defined(__USE_MISC)
#if defined(_NET_IF_H)

4
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.13.bb → meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb
View File

@@ -7,5 +7,5 @@ SRC_URI_append_libc-musl = "\
file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
"
SRC_URI[md5sum] = "4e8bb562f8fd33d5ef1feb0435ed2b02"
SRC_URI[sha256sum] = "4ab46d1b5a0f8ef83b80760f89ae4f5c88431b19b3cf79ffa0c66d6b33e45772"
SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b"
SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769"