From 521b0ce3f194b9c4c768d8f8ae680a69dc1479f2 Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Thu, 23 Jan 2025 14:12:18 +0100
Subject: all: remove more mentions of the vendor folder

---
 .github/CODEOWNERS                      | 1 -
 executor/_include/flatbuffers/README.md | 6 ++++--
 tools/check-copyright.sh                | 2 +-
 tools/check-language.sh                 | 2 +-
 tools/check-shebang.sh                  | 2 +-
 tools/check-whitespace.sh               | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6fdc8bdc2..8dccfbc2b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,4 +6,3 @@
 *netbsd*	@krytarowski @R3x
 *openbsd*	@blackgnezdo @mptre
 *gvisor*	@avagin
-vendor/		@tarasmadan
diff --git a/executor/_include/flatbuffers/README.md b/executor/_include/flatbuffers/README.md
index 3f687c0fe..7f0d63ef0 100644
--- a/executor/_include/flatbuffers/README.md
+++ b/executor/_include/flatbuffers/README.md
@@ -2,6 +2,8 @@ This was manually vendored on the version v2.0.8
 (which matches the compiler version in the env container)
 using the following commands:
 
+```
 git clone --branch=v2.0.8 --depth=1 --single-branch https://github.com/google/flatbuffers.git
-cp flatbuffers/LICENSE.txt syzkaller/vendor/flatbuffers/
-cp flatbuffers/include/flatbuffers/*.h syzkaller/vendor/flatbuffers/
+cp flatbuffers/LICENSE.txt syzkaller/executor/_include/flatbuffers
+cp flatbuffers/include/flatbuffers/*.h syzkaller/executor/_include/flatbuffers
+```
diff --git a/tools/check-copyright.sh b/tools/check-copyright.sh
index 5d93b0151..fe88c5eaf 100755
--- a/tools/check-copyright.sh
+++ b/tools/check-copyright.sh
@@ -6,7 +6,7 @@ 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/|/vendor/|/gen/|/testdata/"); do
+	-o \( -path "./sys/*/*.txt" \) | egrep -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
 	if [ $? -eq 0 ]; then continue; fi
diff --git a/tools/check-language.sh b/tools/check-language.sh
index 4bd9ad964..b9c5d1d95 100755
--- a/tools/check-language.sh
+++ b/tools/check-language.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 "/vendor/|/gen/|executor/syscalls.h|dashboard/config/linux/bits|pkg/csource/generated.go|tools/check-language.sh"); do
+	egrep -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
diff --git a/tools/check-shebang.sh b/tools/check-shebang.sh
index a7c1e67dd..368e03b64 100755
--- a/tools/check-shebang.sh
+++ b/tools/check-shebang.sh
@@ -4,7 +4,7 @@
 
 FAILED=""
 FILES=0
-for F in $(find . -perm -u=x -type f | egrep -v "/vendor/|/gen/|/.git"); do
+for F in $(find . -perm -u=x -type f | egrep -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
 		echo "$F: Non-portable shebang line. Please use /usr/bin/env to locate the interpreter."
diff --git a/tools/check-whitespace.sh b/tools/check-whitespace.sh
index a23196601..9fdbdf07d 100755
--- a/tools/check-whitespace.sh
+++ b/tools/check-whitespace.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 "/vendor/|/gen/"); do
+		egrep -v "/gen/"); do
 	((FILES+=1))
 	L=0
 	while IFS= read -r LINE; do
-- 
cgit mrf-deployment