1 files changed, 12 insertions, 15 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
index 78ebd31e66..54528b6e6a 100644
--- 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
@@ -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: linux-5.4/scripts/headers_install.sh
-index 593f8879c641..fe1d3fc0d33a 100755
+===================================================================
--- a/scripts/headers_install.sh
+--- linux-5.4.orig/scripts/headers_install.sh
-+++ b/scripts/headers_install.sh
+++ linux-5.4/scripts/headers_install.sh
-@@ -38,6 +38,7 @@ do
+@@ -36,6 +36,7 @@
-                -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
+        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' \
+        s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g
-                -e 's@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @' \
+        s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @
-+               -e ':1;s/(#(if|elif)(.*[^A-Za-z0-9_])defined\([[:space:]]*)_UAPI/\1/;t1' \
+        :1;s/(#(if|elif)(.*[^A-Za-z0-9_])defined\([[:space:]]*)_UAPI/\1/;t1
-                "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
+ ' $INFILE > $TMPFILE || exit 1
-        scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
+ 
-                > "$OUTDIR/$FILE"
+ scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE
-- 
-2.5.0

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 index 78ebd31e66..54528b6e6a 100644 --- 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
@@ -24,18 +24,15 @@ Upstream-Status: Submitted [https://www.spinics.net/lists/arm-kernel/msg694800.h
24	scripts/headers_install.sh \| 1 +	24	scripts/headers_install.sh \| 1 +
25	1 file changed, 1 insertion(+)	25	1 file changed, 1 insertion(+)
26		26
27	diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh	27	Index: linux-5.4/scripts/headers_install.sh
28	index 593f8879c641..fe1d3fc0d33a 100755	28	===================================================================
29	--- a/scripts/headers_install.sh	29	--- linux-5.4.orig/scripts/headers_install.sh
30	+++ b/scripts/headers_install.sh	30	+++ linux-5.4/scripts/headers_install.sh
31	@@ -38,6 +38,7 @@ do	31	@@ -36,6 +36,7 @@
32	-e 's/(^\|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]\|$)/\1__attribute__((packed))\2/g' \	32	s/(^\|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]\|$)/\1__attribute__((packed))\2/g
33	-e 's/(^\|[[:space:](])(inline\|asm\|volatile)([[:space:](]\|$)/\1__\2__\3/g' \	33	s/(^\|[[:space:](])(inline\|asm\|volatile)([[:space:](]\|$)/\1__\2__\3/g
34	-e 's@#(ifndef\|define\|endif[[:space:]]/[])[[:space:]]*_UAPI@#\1 @' \	34	s@#(ifndef\|define\|endif[[:space:]]/[])[[:space:]]*_UAPI@#\1 @
35	+ -e ':1;s/(#(if\|elif)(.[^A-Za-z0-9_])defined\([[:space:]])_UAPI/\1/;t1' \	35	+ :1;s/(#(if\|elif)(.[^A-Za-z0-9_])defined\([[:space:]])_UAPI/\1/;t1
36	"$SRCDIR/$i" > "$OUTDIR/$FILE.sed" \|\| exit 1	36	' $INFILE > $TMPFILE \|\| exit 1
37	scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \	37
38	> "$OUTDIR/$FILE"	38	scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE
39	--
40	2.5.0
41