summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-07-03 12:24:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-04 22:56:15 +0100
commit56ba6da8e19198e7da266ede4e29b20b5abefd41 (patch)
tree1885c2cbe0f00ab4bd36ccf92db8684fedd6b42f /meta/recipes-kernel
parent867f8db6bf31286b9a72e3029d3c9fe0f55a209b (diff)
downloadpoky-56ba6da8e19198e7da266ede4e29b20b5abefd41.tar.gz
linux-libc-headers: remove redundant install_headers patch
This was added in the upgrade to 4.19[1] which included three patches that were taken from the series at [2]. What merged was the second iteration of this series[3] which dropped the install_headers patch, so we can drop this obsolete patch. [1] oe-core 11f02b7c6f9854eecd3a49ea47833c8cbffb1581 [2] https://lore.kernel.org/linux-arm-kernel/1544556407-19897-1-git-send-email-Dave.Martin@arm.com/ [3] https://lore.kernel.org/linux-arm-kernel/1546607391-3850-1-git-send-email-Dave.Martin@arm.com/ (From OE-Core rev: 13e1c0d3881d6c9e4057096d41d8b4f4db1b6b97) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch38
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.9.bb4
2 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch
deleted file mode 100644
index 54528b6e6a..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 9ca6c6a510bda90954aa2532711200b89dd1df89 Mon Sep 17 00:00:00 2001
2From: Dave Martin <Dave.Martin@arm.com>
3Date: Tue, 11 Dec 2018 19:26:45 +0000
4Subject: [PATCH 1/3] kbuild: install_headers.sh: Strip _UAPI from
5 #if-defined() guards
6
7install_headers.sh knows how to strip the _UAPI prefix from #ifdef/
8ifndef and #define directives used to guard headers against multiple
9or inappropriate inclusion. Currently this does not work for guards
10in the "#if defined()" style, which may be needed for non-trivial
11cases.
12
13This patch adds similar logic so that the _UAPI prefix is also
14stripped from guard directives written using "#if defined()" etc.
15
16This is not completely foolproof, but will work for simple cases of
17using #if defined() to guard against inappropriate header inclusion.
18
19Signed-off-by: Dave Martin <Dave.Martin@arm.com>
20Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
21
22Upstream-Status: Submitted [https://www.spinics.net/lists/arm-kernel/msg694800.html]
23---
24 scripts/headers_install.sh | 1 +
25 1 file changed, 1 insertion(+)
26
27Index: linux-5.4/scripts/headers_install.sh
28===================================================================
29--- linux-5.4.orig/scripts/headers_install.sh
30+++ linux-5.4/scripts/headers_install.sh
31@@ -36,6 +36,7 @@
32 s/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g
33 s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g
34 s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @
35+ :1;s/(#(if|elif)(.*[^A-Za-z0-9_])defined\([[:space:]]*)_UAPI/\1/;t1
36 ' $INFILE > $TMPFILE || exit 1
37
38 scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.9.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.9.bb
index 3dd4d547d5..7ebf63a051 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.9.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.9.bb
@@ -6,10 +6,6 @@ SRC_URI:append:libc-musl = "\
6 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 \
7 " 7 "
8 8
9SRC_URI += "\
10 file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \
11"
12
13LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 9LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
14 10
15SRC_URI[sha256sum] = "24fa01fb989c7a3e28453f117799168713766e119c5381dac30115f18f268149" 11SRC_URI[sha256sum] = "24fa01fb989c7a3e28453f117799168713766e119c5381dac30115f18f268149"