From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] checkrootfiles: fix checks on hosts with newer grep
Date: Tue, 16 May 2023 14:20:20 +0200
Message-ID: <20230516122020.15957-1-arne_f@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4428919004352791088=="
List-Id: <development.lists.ipfire.org>

--===============4428919004352791088==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

newer grep versions ignore * in --exclude
work around this by excluding all arch specific directories with
--exclude-dir

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
 tools/checkrootfiles | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/checkrootfiles b/tools/checkrootfiles
index a2712808b..05b16f368 100755
--- a/tools/checkrootfiles
+++ b/tools/checkrootfiles
@@ -34,30 +34,30 @@ if [ "${?}" =3D=3D "0" ]; then
 fi
=20
 grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
-    --exclude rust-ppv-lite86 --exclude rust-memchr --exclude *linux* \
+    --exclude rust-ppv-lite86 --exclude rust-memchr --exclude-dir aarch64 --=
exclude-dir riscv64 --exclude-dir x86_64 \
     --exclude update.sh \
     --exclude-dir oldcore --exclude-dir x86_64 >/dev/null 2>&1
 if [ "${?}" =3D=3D "0" ]; then
 	echo "Error! '/x86_64' in rootfiles files found!"
 	grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
-    --exclude rust-ppv-lite86 --exclude rust-memchr --exclude *linux* \
+    --exclude rust-ppv-lite86 --exclude rust-memchr --exclude-dir aarch64 --=
exclude-dir riscv64 --exclude-dir x86_64  \
     --exclude update.sh \
     --exclude-dir oldcore --exclude-dir x86_64
 	echo "Replace by xxxMACHINExxx !"
 fi
=20
-grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --e=
xclude gdb --exclude liburcu --exclude gdb --exclude-dir oldcore --exclude-di=
r aarch64 >/dev/null 2>&1
+grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --e=
xclude gdb --exclude liburcu --exclude gdb --exclude-dir oldcore --exclude-di=
r aarch64 --exclude-dir riscv64 --exclude-dir x86_64  >/dev/null 2>&1
 if [ "${?}" =3D=3D "0" ]; then
 	echo "Error! '/aarch64' in rootfiles files found!"
 	grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
-    --exclude-dir oldcore --exclude-dir aarch64
+    --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --excl=
ude-dir x86_64
 	echo "Replace by xxxMACHINExxx !"
 fi
=20
-grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --e=
xclude gdb --exclude liburcu --exclude go --exclude-dir oldcore --exclude-dir=
 riscv64 >/dev/null 2>&1
+grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --e=
xclude gdb --exclude liburcu --exclude go --exclude-dir oldcore --exclude-dir=
 aarch64 --exclude-dir riscv64 --exclude-dir x86_64  >/dev/null 2>&1
 if [ "${?}" =3D=3D "0" ]; then
 	echo "Error! '/riscv64' in rootfiles files found!"
 	grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --=
exclude go \
-    --exclude-dir oldcore --exclude-dir riscv64
+    --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --excl=
ude-dir x86_64
 	echo "Replace by xxxMACHINExxx !"
 fi
--=20
2.38.1


--===============4428919004352791088==--