Merge branch 'master' into create-image-debian-version

Author: ajdlinux

pkg/build/linux_gen.sh

@@ -7,5 +7,5 @@ set -eu
 echo -en '// Code generated by pkg/build/linux.go. DO NOT EDIT.\n\n' > linux_generated.go
 echo -en 'package build\n\n' >> linux_generated.go
 echo -en 'const createImageScript = `#!/bin/bash\n' >> linux_generated.go
-cat ../../tools/create-gce-image.sh | egrep -v '^\s*#' >> linux_generated.go
+cat ../../tools/create-gce-image.sh | grep -E -v '^\s*#' >> linux_generated.go
 echo -en '`\n\n' >> linux_generated.go

sys/linux/bpf_trace.txt

@@ -124,7 +124,7 @@ var allTypes = []algType{
 
 // Algorithms can be extracted with something along the following lines:
 //
-//	cat /proc/crypto | grep -B 8 ": skcipher" | grep -B 7 "internal     : no" | egrep "name |driver " | \
+//	cat /proc/crypto | grep -B 8 ": skcipher" | grep -B 7 "internal     : no" | grep -E "name |driver " | \
 //		cut -b 16- | sort | uniq | awk '{printf("{\"%s\", nil},\n", $1)}'
 //
 // Note: the kernel needs to include all crypto configs and CPU needs to support AVX/NEON/etc.

sys/linux/init_alg.go

@@ -73,7 +73,7 @@ var outDir = flag.String("out", "", "path to out dir")
 func main() {
 	defer tool.Init()()
 
-	// Cleanup old files in the case set of architectures has chnaged.
+	// Cleanup old files in the case set of architectures has changed.
 	allFiles, err := filepath.Glob(filepath.Join(*outDir, "sys", generated.Glob()))
 	if err != nil {
 		tool.Failf("failed to glob: %v", err)

sys/syz-sysgen/sysgen.go

@@ -23,7 +23,7 @@ for HASH in ${HASHES}; do
 	((COMMITS+=1))
 	SUBJECT=$(git show --format="%s" --no-patch ${HASH})
 	BODY=$(git show --format="%B" --no-patch ${HASH})
-	PATTERN="^(Revert \"|(([a-z0-9/_.-]+|Makefile|CONTRIBUTORS|README.md)(, )?)+:\ [^A-Z].+[^.]$)"
+	PATTERN="^(Revert \"|(([a-z0-9/_.-]+|Makefile|AUTHORS|CONTRIBUTORS|README.md)(, )?)+:\ [^A-Z].+[^.]$)"
 	if ! [[ ${SUBJECT} =~ $PATTERN ]]; then
 		echo "##[error]Wrong commit subject format: '${SUBJECT}'.\
  Please use 'main/affected/package: short change description'.\

tools/check-commits.sh

@@ -6,12 +6,12 @@ FILES=0
 FAILED=""
 for F in $(find . -name "*.go" -o -name "*.sh" -o -name "*.cpp" -o -name "*.cc" -o -name "*.h" \
 	-o -name "*.S" -o -name "*.py" -o -name "*.yml" -o -name "*.yaml" -o -name "*.fbs" \
-	-o \( -path "./sys/*/*.txt" \) | egrep -v "/_include/|/gen/|/testdata/"); do
+	-o \( -path "./sys/*/*.txt" \) | grep -E -v "/_include/|/gen/|/testdata/"); do
 	((FILES+=1))
-	cat $F | tr '\n' '_' | egrep "(//|#) Copyright 20[0-9]{2}(/20[0-9]{2})? syzkaller project authors\. All rights reserved\._(//|#) Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file\." >/dev/null
+	cat $F | tr '\n' '_' | grep -E "(//|#) Copyright 20[0-9]{2}(/20[0-9]{2})? syzkaller project authors\. All rights reserved\._(//|#) Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file\." >/dev/null
 	if [ $? -eq 0 ]; then continue; fi
 	# Ignore auto-generated files.
-	egrep "^(//|#) Code generated .* DO NOT EDIT\\.|(WARNING: This file is machine generated)|automatically generated by the FlatBuffers compiler" $F >/dev/null
+	grep -E "^(//|#) Code generated .* DO NOT EDIT\\.|(WARNING: This file is machine generated)|automatically generated by the FlatBuffers compiler" $F >/dev/null
 	if [ $? -eq 0 ]; then continue; fi
 	# Ignore untracked files.
 	git ls-files --error-unmatch $F >/dev/null 2>&1

tools/check-copyright.sh

@@ -7,7 +7,7 @@ FAILED=""
 shopt -s nocasematch
 for F in $(find . -name "*.go" -o -name "*.sh" -o -name "*.cc" -o -name "*.md" \
 	-o -name "*.S" -o -name "*.py" -o -name "*.yml" -o -name "*.yaml" | \
-	egrep -v "/gen/|executor/syscalls.h|dashboard/config/linux/bits|pkg/csource/generated.go|tools/check-language.sh"); do
+	grep -E -v "/gen/|executor/syscalls.h|dashboard/config/linux/bits|pkg/csource/generated.go|tools/check-language.sh"); do
 	((FILES+=1))
 	L=0
 	while IFS= read -r LINE; do

tools/check-language.sh

@@ -4,9 +4,9 @@
 
 FAILED=""
 FILES=0
-for F in $(find . -perm -u=x -type f | egrep -v "/gen/|/.git"); do
+for F in $(find . -perm -u=x -type f | grep -E -v "/gen/|/.git"); do
 	((FILES+=1))
-	if head -n 1 "$F" | egrep -q '^#!/' && head -n 1 "$F" | egrep -v -q -e '^#!/bin/sh$' -e '^#!/usr/bin/env '; then
+	if head -n 1 "$F" | grep -E -q '^#!/' && head -n 1 "$F" | grep -E -v -q -e '^#!/bin/sh$' -e '^#!/usr/bin/env '; then
 		echo "$F: Non-portable shebang line. Please use /usr/bin/env to locate the interpreter."
 		FAILED=1
 	fi

tools/check-shebang.sh

@@ -7,7 +7,7 @@ FAILED=""
 RE="[[:space:]]$"
 LAST_EMPTY=""
 for F in $(find . -name "*.sh" -o -name "*.S" -o -name "*.py" -o -name "*.yml" -o -name "*.yaml" -o -name "*.md" | \
-		egrep -v "/gen/"); do
+		grep -E -v "/gen/"); do
 	((FILES+=1))
 	L=0
 	while IFS= read -r LINE; do