summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-02-27 00:05:55 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-28 23:11:29 +0000
commitc439e5667393324eea6ba7f3d7ab2ef1e1dc4ee5 (patch)
treea544647760b2dcd28b176b783ce5f4bfc3fff20f /meta
parentf5803c5ee2c46a062a27254c03a5068ace0fc627 (diff)
downloadpoky-c439e5667393324eea6ba7f3d7ab2ef1e1dc4ee5.tar.gz
linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR
__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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch31
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch30
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb2
3 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch
deleted file mode 100644
index 68b244698f..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Thu, 1 Mar 2018 18:31:01 -0500
4Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file
5
6Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
7Upstream-Status: Pending
8---
9 include/uapi/linux/if_ether.h | 6 ++++++
10 1 file changed, 6 insertions(+)
11
12diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
13index 153c9c2..7b69b73 100644
14--- a/include/uapi/linux/if_ether.h
15+++ b/include/uapi/linux/if_ether.h
16@@ -149,6 +149,12 @@
17 * This is an Ethernet frame header.
18 */
19
20+#ifdef _NETINET_IF_ETHER_H /* musl */
21+#define __UAPI_DEF_ETHHDR 0
22+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */
23+#define __UAPI_DEF_ETHHDR 1
24+#endif
25+
26 /* allow libcs like musl to deactivate this, glibc does not implement this. */
27 #ifndef __UAPI_DEF_ETHHDR
28 #define __UAPI_DEF_ETHHDR 1
29--
302.7.4
31
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
deleted file mode 100644
index fb7e1de17a..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001
2From: rofl0r <retnyg@gmx.net>
3Date: Wed, 22 Jan 2014 00:57:48 +0100
4Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr
5
6---
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Upstream-Status: Submitted
9
10 include/uapi/linux/if_ether.h | 4 +++-
11 include/uapi/linux/libc-compat.h | 6 ++++++
12 2 files changed, 9 insertions(+), 1 deletion(-)
13
14Index: linux-4.15/include/uapi/linux/libc-compat.h
15===================================================================
16--- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500
17+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500
18@@ -51,6 +51,12 @@
19
20 #ifndef __KERNEL__ /* we're used from userspace */
21
22+#ifdef _NETINET_IF_ETHER_H /* musl */
23+#define __UAPI_DEF_ETHHDR 0
24+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */
25+#define __UAPI_DEF_ETHHDR 1
26+#endif
27+
28 /* Coordinate with libc net/if.h header. */
29 #if defined(_NET_IF_H)
30
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
index 50377394f3..8a12103ee5 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
@@ -2,10 +2,8 @@ require linux-libc-headers.inc
2 2
3SRC_URI_append_libc-musl = "\ 3SRC_URI_append_libc-musl = "\
4 file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ 4 file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
5 file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \
6 file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ 5 file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
7 file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ 6 file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
8 file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \
9 file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ 7 file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \
10 " 8 "
11 9