]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.0-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 27 Nov 2022 20:57:21 +0000 (21:57 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 27 Nov 2022 20:57:21 +0000 (21:57 +0100)
added patches:
lib-vdso-use-grep-e-instead-of-egrep.patch

queue-6.0/lib-vdso-use-grep-e-instead-of-egrep.patch [new file with mode: 0644]
queue-6.0/series

diff --git a/queue-6.0/lib-vdso-use-grep-e-instead-of-egrep.patch b/queue-6.0/lib-vdso-use-grep-e-instead-of-egrep.patch
new file mode 100644 (file)
index 0000000..4513845
--- /dev/null
@@ -0,0 +1,33 @@
+From 8ac3b5cd3e0521d92f9755e90d140382fc292510 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 20 Sep 2022 19:06:33 +0200
+Subject: lib/vdso: use "grep -E" instead of "egrep"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit 8ac3b5cd3e0521d92f9755e90d140382fc292510 upstream.
+
+The latest version of grep claims the egrep is now obsolete so the build
+now contains warnings that look like:
+       egrep: warning: egrep is obsolescent; using grep -E
+fix this up by moving the vdso Makefile to use "grep -E" instead.
+
+Cc: Andy Lutomirski <luto@kernel.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
+Link: https://lore.kernel.org/r/20220920170633.3133829-1-gregkh@linuxfoundation.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ lib/vdso/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/vdso/Makefile
++++ b/lib/vdso/Makefile
+@@ -17,6 +17,6 @@ $(error ARCH_REL_TYPE_ABS is not set)
+ endif
+ quiet_cmd_vdso_check = VDSOCHK $@
+-      cmd_vdso_check = if $(OBJDUMP) -R $@ | egrep -h "$(ARCH_REL_TYPE_ABS)"; \
++      cmd_vdso_check = if $(OBJDUMP) -R $@ | grep -E -h "$(ARCH_REL_TYPE_ABS)"; \
+                      then (echo >&2 "$@: dynamic relocations are not supported"; \
+                            rm -f $@; /bin/false); fi
index 4fcef768f4b3c671d8df89222e07d8cbfa700d5f..7506a89ac8578468c62ac0d5dc415f2b99f99a31 100644 (file)
@@ -157,3 +157,4 @@ net-thunderx-fix-the-acpi-memory-leak.patch
 s390-crashdump-fix-tod-programmable-field-size.patch
 io_uring-filetable-fix-file-reference-underflow.patch
 io_uring-poll-fix-poll_refs-race-with-cancelation.patch
+lib-vdso-use-grep-e-instead-of-egrep.patch