diff options
| author | Felix Singer <felix.singer@secunet.com> | 2023-04-01 14:42:54 +0200 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2023-04-06 19:54:44 +0000 |
| commit | 74b4bd0e92a77635bbb584d8b7913deb9a134da7 (patch) | |
| tree | fb591e761ce8d63a0797f346592bb3604f49ffa5 | |
| parent | 1d13fba3c32ba7974b2c73428ff4b096e814dcd2 (diff) | |
| download | coreboot-74b4bd0e92a77635bbb584d8b7913deb9a134da7.tar.gz coreboot-74b4bd0e92a77635bbb584d8b7913deb9a134da7.tar.bz2 coreboot-74b4bd0e92a77635bbb584d8b7913deb9a134da7.zip | |
tree: Replace `egrep` with `grep -E`
For compatibility reasons, egrep is just a wrapper around grep today.
Thus, replace it with `grep -E`.
Change-Id: Ief08a22e4cd7211a3fee278492c95d37f9e058fa
Signed-off-by: Felix Singer <felix.singer@secunet.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74171
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
| -rw-r--r-- | payloads/libpayload/curses/PDCurses/aclocal.m4 | 2 | ||||
| -rwxr-xr-x | util/lint/lint-000-license-headers | 2 | ||||
| -rwxr-xr-x | util/lint/lint-001-no-global-config-in-romstage | 2 | ||||
| -rwxr-xr-x | util/lint/lint-stable-009-old-licenses | 2 | ||||
| -rwxr-xr-x | util/scripts/cross-repo-cherrypick | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/payloads/libpayload/curses/PDCurses/aclocal.m4 b/payloads/libpayload/curses/PDCurses/aclocal.m4 index ad7c3f3a441e..c5ccea112a67 100644 --- a/payloads/libpayload/curses/PDCurses/aclocal.m4 +++ b/payloads/libpayload/curses/PDCurses/aclocal.m4 @@ -463,7 +463,7 @@ EOF DYN_COMP="" else slash="\\" - mh_dyncomp="`egrep -c $slash$a conftest.tmp`" + mh_dyncomp="`grep -E -c $slash$a conftest.tmp`" if test "$mh_dyncomp" = "0"; then DYN_COMP="$a -DDYNAMIC" AC_MSG_RESULT($a) diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers index 233759b0bb7e..0f187688d24b 100755 --- a/util/lint/lint-000-license-headers +++ b/util/lint/lint-000-license-headers @@ -81,7 +81,7 @@ fi #get initial list from git, removing HEADER_EXCLUDED files. #make a copy to check for the old style header later. -headerlist=$(${FIND_FILES} $HEADER_DIRS | egrep -v "($HEADER_EXCLUDED)") +headerlist=$(${FIND_FILES} $HEADER_DIRS | grep -E -v "($HEADER_EXCLUDED)") #update headerlist by removing files that match the license string check_for_license() { diff --git a/util/lint/lint-001-no-global-config-in-romstage b/util/lint/lint-001-no-global-config-in-romstage index e81bea7d3414..bd4e24bae591 100755 --- a/util/lint/lint-001-no-global-config-in-romstage +++ b/util/lint/lint-001-no-global-config-in-romstage @@ -10,7 +10,7 @@ LC_ALL=C export LC_ALL find src -name .svn -type d -prune -o -name mainboard -type d -prune -o -name examples -type d -prune -o -type f -exec sed -nf `dirname $0`/remccoms3.sed {} + > $SCANBUCKET for define in $DEFINES; do - if [ `egrep -c "([^_A-Za-z0-9]$define[^_A-Za-z0-9]|^$define[^_A-Za-z0-9]|[^_A-Za-z0-9]$define\$)" $SCANBUCKET` -gt 0 ]; then + if [ `grep -E -c "([^_A-Za-z0-9]$define[^_A-Za-z0-9]|^$define[^_A-Za-z0-9]|[^_A-Za-z0-9]$define\$)" $SCANBUCKET` -gt 0 ]; then echo "$define is defined in mainboard(s) and used elsewhere" fi done diff --git a/util/lint/lint-stable-009-old-licenses b/util/lint/lint-stable-009-old-licenses index 09b53a2b144d..bb508d7f04d4 100755 --- a/util/lint/lint-stable-009-old-licenses +++ b/util/lint/lint-stable-009-old-licenses @@ -39,7 +39,7 @@ if [ -z "$HEADER_DIRS" ]; then HEADER_DIRS="src util tests" fi -headerlist=$(${FIND_FILES} $HEADER_DIRS | egrep -v "($HEADER_EXCLUDED)") +headerlist=$(${FIND_FILES} $HEADER_DIRS | grep -E -v "($HEADER_EXCLUDED)") #check for the old style header headerlist=$(grep -il "You should have received a copy of the GNU" \ diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick index 7442b9ba1585..1a174a977290 100755 --- a/util/scripts/cross-repo-cherrypick +++ b/util/scripts/cross-repo-cherrypick @@ -36,7 +36,7 @@ esac # lines must be backwards due to tac(1) SPLICE_CMD="" if test "$1" = "--cros"; then - if test -z "$( commit_message |egrep '^(BUG|TEST)=')"; then + if test -z "$(commit_message | grep -E '^(BUG|TEST)=')"; then SPLICE_CMD='print "\nTEST=none\nBRANCH=none\nBUG=none\n"' fi fi |