Browse Source

Use `grep -E` or plain `grep` instead of `egrep`

`egrep` has been deprecated in GNU grep since 2007,
and since 3.8 it emits obsolescence warnings:
https://git.savannah.gnu.org/cgit/grep.git/commit/?id=a9515624709865d480e3142fd959bccd1c9372d1
Acked-by: Dhruva Gole <d-gole@ti.com>
Ville Skyttä 1 year ago
parent
commit
fe482b886d

+ 8 - 8
arch/arm/mach-socfpga/qts-filter-a10.sh

@@ -10,7 +10,7 @@ fix_newlines_in_macros() {
 
 #filter out only what we need from a10 hps.xml
 grep_a10_hps_config() {
-	egrep "clk_hz|i_clk_mgr|i_io48_pin_mux|AXI_SLAVE|AXI_MASTER"
+	grep -E "clk_hz|i_clk_mgr|i_io48_pin_mux|AXI_SLAVE|AXI_MASTER"
 }
 
 #
@@ -35,35 +35,35 @@ EOF
 
 	echo "/* Clocks */"
 	fix_newlines_in_macros \
-		${hps_xml} | egrep "clk_hz" |
+		${hps_xml} | grep "clk_hz" |
 			awk -F"'" '{ gsub("\\.","_",$2) ; \
 				print "#define" " " toupper($2) " " $4}' |
 			sed 's/\.[0-9]//' |
 			sed 's/I_CLK_MGR_//' |
 			sort
 	fix_newlines_in_macros \
-		${hps_xml} | egrep "i_clk_mgr_mainpll" |
+		${hps_xml} | grep "i_clk_mgr_mainpll" |
 			awk -F"'" '{ gsub("\\.","_",$2) ; \
 				print "#define" " " toupper($2) " " $4}' |
 			sed 's/\.[0-9]//' |
 			sed 's/I_CLK_MGR_//' |
 			sort
 	fix_newlines_in_macros \
-		${hps_xml} | egrep "i_clk_mgr_perpll" |
+		${hps_xml} | grep "i_clk_mgr_perpll" |
 			awk -F"'" '{ gsub("\\.","_",$2) ; \
 				print "#define" " " toupper($2) " " $4}' |
 			sed 's/\.[0-9]//' |
 			sed 's/I_CLK_MGR_//' |
 			sort
 	fix_newlines_in_macros \
-		${hps_xml} | egrep "i_clk_mgr_clkmgr" |
+		${hps_xml} | grep "i_clk_mgr_clkmgr" |
 			awk -F"'" '{ gsub("\\.","_",$2) ; \
 				print "#define" " " toupper($2) " " $4}' |
 			sed 's/\.[0-9]//' |
 			sed 's/I_CLK_MGR_//' |
 			sort
 	fix_newlines_in_macros \
-		${hps_xml} | egrep "i_clk_mgr_alteragrp" |
+		${hps_xml} | grep "i_clk_mgr_alteragrp" |
 			awk -F"'" '{ gsub("\\.","_",$2) ; \
 				print "#define" " " toupper($2) " " $4}' |
 			sed 's/\.[0-9]//' |
@@ -77,7 +77,7 @@ EOF
 	echo
 	echo "/* Pin Mux Configuration */"
 	fix_newlines_in_macros \
-		${hps_xml} | egrep "i_io48_pin_mux" |
+		${hps_xml} | grep "i_io48_pin_mux" |
 			awk -F"'" '{ gsub("\\.","_",$2) ; \
 				print "#define" " " toupper($2) " " $4}' |
 			sed 's/I_IO48_PIN_MUX_//' |
@@ -90,7 +90,7 @@ EOF
 	echo
 	echo "/* Bridge Configuration */"
 	fix_newlines_in_macros \
-		${hps_xml} | egrep "AXI_SLAVE|AXI_MASTER" |
+		${hps_xml} | grep -E "AXI_SLAVE|AXI_MASTER" |
 			awk -F"'" '{ gsub("\\.","_",$2) ; \
 				print "#define" " " toupper($2) " " $4}' |
 			sed 's/true/1/' |

File diff suppressed because it is too large
+ 0 - 0
arch/arm/mach-socfpga/qts-filter.sh


+ 1 - 1
doc/board/intel/edison.rst

@@ -90,7 +90,7 @@ If you want to check if the board is ready, type:
 
 .. code-block:: none
 
-  lsusb | egrep "8087|8086"
+  lsusb | grep -E "8087|8086"
   Bus 001 Device 004: ID 8086:e005 Intel Corp.
 
 If you see a device with the same ID as above, the board is waiting for your

+ 1 - 1
scripts/coccicheck

@@ -54,7 +54,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 -Ee "--profile|--show-trying" 2>&1 > /dev/null
 if [ $? -eq 0 ]; then
 	FLAGS="--quiet"
 fi

+ 5 - 5
test/fs/fs-test.sh

@@ -462,22 +462,22 @@ function check_results() {
 	FAIL=0
 
 	# Check if the ls is showing correct results for 2.5 gb file
-	grep -A7 "Test Case 1 " "$1" | egrep -iq "2621440000 *$4"
+	grep -A7 "Test Case 1 " "$1" | grep -Eiq "2621440000 *$4"
 	pass_fail "TC1: ls of $4"
 
 	# Check if the ls is showing correct results for 1 mb file
-	grep -A7 "Test Case 1 " "$1" | egrep -iq "1048576 *$3"
+	grep -A7 "Test Case 1 " "$1" | grep -Eiq "1048576 *$3"
 	pass_fail "TC1: ls of $3"
 
 	# Check size command on 1MB.file
-	egrep -A3 "Test Case 2a " "$1" | grep -q "filesize=100000"
+	grep -A3 "Test Case 2a " "$1" | grep -q "filesize=100000"
 	pass_fail "TC2: size of $3"
 	# Check size command on 1MB.file via a path using '..'
-	egrep -A3 "Test Case 2b " "$1" | grep -q "filesize=100000"
+	grep -A3 "Test Case 2b " "$1" | grep -q "filesize=100000"
 	pass_fail "TC2: size of $3 via a path using '..'"
 
 	# Check size command on 2.5GB.file
-	egrep -A3 "Test Case 3 " "$1" | grep -q "filesize=9c400000"
+	grep -A3 "Test Case 3 " "$1" | grep -q "filesize=9c400000"
 	pass_fail "TC3: size of $4"
 
 	# Check read full mb of 1MB.file

Some files were not shown because too many files changed in this diff