From 5c27a7014bb874375c19f0036c065ce645a39786 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 5 Jul 2022 11:03:37 +0200 Subject: [PATCH] Remove egrep uses that have crept back in egrep will start to warn in the next coreutils release. --- glibc.req.in | 4 ++-- glibc.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glibc.req.in b/glibc.req.in index 9fb7f76..b82c5a1 100644 --- a/glibc.req.in +++ b/glibc.req.in @@ -28,10 +28,10 @@ eu-elfclassify --loadable --file --stdin --print | while read path; do if $searching; then # Undefined symbols within latest, under-development # (changing) symbol versions trigger the versioned RPM - # dependency. Do not use "egrep -q" to keep reading from the + # dependency. Do not use "grep -Eq" to keep reading from the # pipe, avoiding a spurious EPIPE error in eu-readelf. if eu-readelf -s "$path" \ - | egrep '\sUNDEF\s.*@''@SYMVER@(\s|$)' >/dev/null + | grep -E '\sUNDEF\s.*@''@SYMVER@(\s|$)' >/dev/null then echo 'glibc >= @VERSION@-@RELEASE@' # Stop searching after the first match, but keep reading from diff --git a/glibc.spec b/glibc.spec index 83ed24b..242dec4 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1716,8 +1716,8 @@ grep '%{_prefix}/include/gnu/stubs-.*\.h$' < master.filelist >> devel.filelist | grep '%{_prefix}/include/gnu/lib-names-.*\.h$' < master.filelist >> devel.filelist || : # Put the include files into headers file list. grep '%{_prefix}/include' < master.filelist \ - | egrep -v '%{_prefix}/include/gnu/stubs-.*\.h$' \ - | egrep -v '%{_prefix}/include/gnu/lib-names-.*\.h$' \ + | grep -E -v '%{_prefix}/include/gnu/stubs-.*\.h$' \ + | grep -E -v '%{_prefix}/include/gnu/lib-names-.*\.h$' \ > headers.filelist %else # If there is no glibc-headers package, all header files go into the