diff options
| -rw-r--r-- | 0001-lib-vdso-use-grep-E-instead-of-egrep.patch | 28 | ||||
| -rw-r--r-- | 0001-readfile-implement-readfile-syscall.patch | 2 | ||||
| -rw-r--r-- | 0002-scripts-selinux-use-grep-E-instead-of-egrep.patch | 30 | ||||
| -rw-r--r-- | 0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch | 29 | ||||
| -rw-r--r-- | 0003-selftests-add-readfile-2-selftests.patch | 2 | ||||
| -rw-r--r-- | series | 3 |
6 files changed, 92 insertions, 2 deletions
diff --git a/0001-lib-vdso-use-grep-E-instead-of-egrep.patch b/0001-lib-vdso-use-grep-E-instead-of-egrep.patch new file mode 100644 index 00000000000000..613fbf9764014d --- /dev/null +++ b/0001-lib-vdso-use-grep-E-instead-of-egrep.patch @@ -0,0 +1,28 @@ +From de1878a9305dbbfd895f4f73f05da04e56713a4a Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Tue, 20 Sep 2022 19:03:40 +0200 +Subject: [PATCH 1/3] lib/vdso: use "grep -E" instead of "egrep" + +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> +Cc: Vincenzo Frascino <vincenzo.frascino@arm.com> +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 diff --git a/0001-readfile-implement-readfile-syscall.patch b/0001-readfile-implement-readfile-syscall.patch index 20523621604c1b..4c9d2d706667f1 100644 --- a/0001-readfile-implement-readfile-syscall.patch +++ b/0001-readfile-implement-readfile-syscall.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/fs/open.c +++ b/fs/open.c -@@ -1526,3 +1526,53 @@ int stream_open(struct inode *inode, str +@@ -1528,3 +1528,53 @@ int stream_open(struct inode *inode, str } EXPORT_SYMBOL(stream_open); diff --git a/0002-scripts-selinux-use-grep-E-instead-of-egrep.patch b/0002-scripts-selinux-use-grep-E-instead-of-egrep.patch new file mode 100644 index 00000000000000..a8d1a9c64c0462 --- /dev/null +++ b/0002-scripts-selinux-use-grep-E-instead-of-egrep.patch @@ -0,0 +1,30 @@ +From 60c12e0a39567979e05625ccd275192e1e720e74 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Tue, 20 Sep 2022 19:10:40 +0200 +Subject: [PATCH 2/3] scripts/selinux: use "grep -E" instead of "egrep" + +The latest version of grep claims that 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: Paul Moore <paul@paul-moore.com> +Cc: Stephen Smalley <stephen.smalley.work@gmail.com> +Cc: Eric Paris <eparis@parisplace.org> +Cc: selinux@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + scripts/selinux/install_policy.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/selinux/install_policy.sh ++++ b/scripts/selinux/install_policy.sh +@@ -78,7 +78,7 @@ cd /etc/selinux/dummy/contexts/files + $SF -F file_contexts / + + mounts=`cat /proc/$$/mounts | \ +- egrep "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \ ++ grep -E "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \ + awk '{ print $2 '}` + $SF -F file_contexts $mounts + diff --git a/0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch b/0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch new file mode 100644 index 00000000000000..e0322f95d88458 --- /dev/null +++ b/0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch @@ -0,0 +1,29 @@ +From 81da721534f3fe8c01428a1179ad70a50e2e34b8 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 21 Sep 2022 11:11:47 +0200 +Subject: [PATCH 3/3] scripts: coccicheck: use "grep -E" instead of "egrep" + +The latest version of grep claims that 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: Julia Lawall <Julia.Lawall@inria.fr> +Cc: Nicolas Palix <nicolas.palix@imag.fr> +Cc: cocci@inria.fr +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + scripts/coccicheck | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/coccicheck ++++ b/scripts/coccicheck +@@ -47,7 +47,7 @@ FLAGS="--very-quiet" + # inspected there. + # + # --profile will not output if --very-quiet is used, so avoid it. +-echo $SPFLAGS | egrep -e "--profile|--show-trying" 2>&1 > /dev/null ++echo $SPFLAGS | grep -E -e "--profile|--show-trying" 2>&1 > /dev/null + if [ $? -eq 0 ]; then + FLAGS="--quiet" + fi diff --git a/0003-selftests-add-readfile-2-selftests.patch b/0003-selftests-add-readfile-2-selftests.patch index a2b4c8951cca75..f9c6180cb3d978 100644 --- a/0003-selftests-add-readfile-2-selftests.patch +++ b/0003-selftests-add-readfile-2-selftests.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile -@@ -59,6 +59,7 @@ TARGETS += resctrl +@@ -61,6 +61,7 @@ TARGETS += resctrl TARGETS += rlimits TARGETS += rseq TARGETS += rtc @@ -1,4 +1,7 @@ # +0001-lib-vdso-use-grep-E-instead-of-egrep.patch +0002-scripts-selinux-use-grep-E-instead-of-egrep.patch +0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch 0001-driver-core-aux-test-code.patch copying.patch 0001-readfile-implement-readfile-syscall.patch |