Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / tools / checkrootfiles

diff --git a/tools/checkrootfiles b/tools/checkrootfiles
index 74fab3e02310b6bce11bf37e8375f9bd02e7dea5..1a55a4da9bf5d08601f96899885a90c84620c7c1 100755 (executable)
--- a/tools/checkrootfiles
+++ b/tools/checkrootfiles
@@ -33,16 +33,30 @@ if [ "${?}" == "0" ]; then
        echo "Comment this and create it at initskript if needed !"
 fi
 
-grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1
+grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
+    --exclude rust-ppv-lite86 --exclude rust-memchr --exclude *linux* \
+    --exclude-dir oldcore --exclude-dir x86_64 >/dev/null 2>&1
 if [ "${?}" == "0" ]; then
-       echo "Error! '/i586' in rootfiles files found!"
-       grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore
-       echo "Replace by MACHINE !"
+       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-dir oldcore --exclude-dir x86_64
+       echo "Replace by xxxMACHINExxx !"
 fi
 
-grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1
+grep -r '/armv6l' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
+    --exclude-dir oldcore --exclude-dir armv5tel >/dev/null 2>&1
 if [ "${?}" == "0" ]; then
-       echo "Error! '/armv5tel' in rootfiles files found!"
-       grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore
-       echo "Replace by MACHINE !"
+       echo "Error! '/armv6l' in rootfiles files found!"
+       grep -r '/armv6l' ./config/rootfiles/ --exclude gcc \
+    --exclude-dir oldcore --exclude-dir armv5tel
+       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
+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
+       echo "Replace by xxxMACHINExxx !"
 fi