checkrootfiles: fix checks on hosts with newer grep
Commit Message
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@ipfire.org>
---
tools/checkrootfiles | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
@@ -34,30 +34,30 @@ if [ "${?}" == "0" ]; then
fi
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 [ "${?}" == "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
-grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude gdb --exclude-dir oldcore --exclude-dir aarch64 >/dev/null 2>&1
+grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude gdb --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1
if [ "${?}" == "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 --exclude-dir x86_64
echo "Replace by xxxMACHINExxx !"
fi
-grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude 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 --exclude gdb --exclude liburcu --exclude go --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1
if [ "${?}" == "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 --exclude-dir x86_64
echo "Replace by xxxMACHINExxx !"
fi