From 0cc0bcdbc877a8c2a7b309bab23eae59f6928c07 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 27 Nov 2022 21:57:21 +0100 Subject: [PATCH] 6.0-stable patches added patches: lib-vdso-use-grep-e-instead-of-egrep.patch --- ...lib-vdso-use-grep-e-instead-of-egrep.patch | 33 +++++++++++++++++++ queue-6.0/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 queue-6.0/lib-vdso-use-grep-e-instead-of-egrep.patch 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 index 00000000000..45138456030 --- /dev/null +++ b/queue-6.0/lib-vdso-use-grep-e-instead-of-egrep.patch @@ -0,0 +1,33 @@ +From 8ac3b5cd3e0521d92f9755e90d140382fc292510 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 20 Sep 2022 19:06:33 +0200 +Subject: lib/vdso: use "grep -E" instead of "egrep" + +From: Greg Kroah-Hartman + +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 +Cc: Thomas Gleixner +Reviewed-by: Vincenzo Frascino +Link: https://lore.kernel.org/r/20220920170633.3133829-1-gregkh@linuxfoundation.org +Signed-off-by: Greg Kroah-Hartman +--- + 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 diff --git a/queue-6.0/series b/queue-6.0/series index 4fcef768f4b..7506a89ac85 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -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 -- 2.47.3