diff options
Diffstat (limited to 'poky/meta/recipes-kernel/linux-libc-headers')
-rw-r--r-- | poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch | 31 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch | 27 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch | 30 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb (renamed from poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb) | 6 |
5 files changed, 15 insertions, 81 deletions
diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 7f838f623e..4481aa430c 100644 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -91,4 +91,4 @@ RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "unifdef-native bison-native" +DEPENDS += "unifdef-native bison-native rsync-native" diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/poky/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/poky/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 @@ -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 - diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch index 78ebd31e66..54528b6e6a 100644 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch @@ -24,18 +24,15 @@ Upstream-Status: Submitted [https://www.spinics.net/lists/arm-kernel/msg694800.h scripts/headers_install.sh | 1 + 1 file changed, 1 insertion(+) -diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh -index 593f8879c641..fe1d3fc0d33a 100755 ---- a/scripts/headers_install.sh -+++ b/scripts/headers_install.sh -@@ -38,6 +38,7 @@ do - -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \ - -e 's/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g' \ - -e 's@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @' \ -+ -e ':1;s/(#(if|elif)(.*[^A-Za-z0-9_])defined\([[:space:]]*)_UAPI/\1/;t1' \ - "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1 - scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \ - > "$OUTDIR/$FILE" --- -2.5.0 - +Index: linux-5.4/scripts/headers_install.sh +=================================================================== +--- linux-5.4.orig/scripts/headers_install.sh ++++ linux-5.4/scripts/headers_install.sh +@@ -36,6 +36,7 @@ + s/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g + s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g + s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @ ++ :1;s/(#(if|elif)(.*[^A-Za-z0-9_])defined\([[:space:]]*)_UAPI/\1/;t1 + ' $INFILE > $TMPFILE || exit 1 + + scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/poky/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/poky/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 @@ -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) - diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb index 9d18df76c6..8a12103ee5 100644 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb @@ -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 \ " @@ -14,5 +12,5 @@ SRC_URI_append = "\ file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ " -SRC_URI[md5sum] = "ddf994de00d7b18395886dd9b30b9262" -SRC_URI[sha256sum] = "54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7" +SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9" +SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491" |