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: Drop patches manipulating __UAPI_DEF_ETHHDR

Browse Source 
__UAPI_DEF_ETHHDR has been defined in kernel UAPI [1]

and musl already defined it to 0 via [2]

So these patches can now be dropped.

[1] https://patchwork.ozlabs.org/patch/872502/
[2] https://git.musl-libc.org/cgit/musl/commit/?id=b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc

(From OE-Core rev: 6da3239b73fa3ebf8c62c7f38b5b4a3795d502b5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2020-02-27 00:05:55 -08:00
committed by Richard Purdie
parent f5803c5ee2
commit c439e56673
3 changed files with 0 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch
View File

@@ -1,31 +0,0 @@
From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 1 Mar 2018 18:31:01 -0500
Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Upstream-Status: Pending
---
include/uapi/linux/if_ether.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
index 153c9c2..7b69b73 100644
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
@@ -149,6 +149,12 @@
* This is an Ethernet frame header.
*/
+#ifdef _NETINET_IF_ETHER_H /* musl */
+#define __UAPI_DEF_ETHHDR 0
+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */
+#define __UAPI_DEF_ETHHDR 1
+#endif
+
/* allow libcs like musl to deactivate this, glibc does not implement this. */
#ifndef __UAPI_DEF_ETHHDR
#define __UAPI_DEF_ETHHDR 1
--
2.7.4

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

@@ -1,30 +0,0 @@
From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001
From: rofl0r <retnyg@gmx.net>
Date: Wed, 22 Jan 2014 00:57:48 +0100
Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr
---
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Submitted
include/uapi/linux/if_ether.h | 4 +++-
include/uapi/linux/libc-compat.h | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)
Index: linux-4.15/include/uapi/linux/libc-compat.h
===================================================================
--- 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 */
+#ifdef _NETINET_IF_ETHER_H /* musl */
+#define __UAPI_DEF_ETHHDR 0
+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */
+#define __UAPI_DEF_ETHHDR 1
+#endif
+
/* Coordinate with libc net/if.h header. */
#if defined(_NET_IF_H)

2
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
View File

@@ -2,10 +2,8 @@ require linux-libc-headers.inc
SRC_URI_append_libc-musl = "\
file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \
file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \
file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \
"