From 30b3b2cde7d1698228550e509b4b87e080943890 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 29 Dec 2019 13:42:31 +0000 Subject: [PATCH] checkrootfiles: ignore arch folder and add x86_64,aarch64 rust has arch depending rootfiles which make no sense to replache the arch by machine. Also added missing arches to check. --- tools/checkrootfiles | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/checkrootfiles b/tools/checkrootfiles index 74fab3e023..7b996d4805 100755 --- 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 '/i586' ./config/rootfiles/ --exclude gcc --exclude-dir oldcore --exclude-dir i586 >/dev/null 2>&1 if [ "${?}" == "0" ]; then echo "Error! '/i586' in rootfiles files found!" - grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore + grep -r '/i586' ./config/rootfiles/ --exclude gcc --exclude-dir oldcore --exclude-dir i586 echo "Replace by MACHINE !" fi -grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1 +grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude *linux* --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 *linux* --exclude-dir oldcore --exclude-dir x86_64 + echo "Replace by MACHINE !" +fi + +grep -r '/armv5tel' ./config/rootfiles/ --exclude gcc --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 + grep -r '/armv5tel' ./config/rootfiles/ --exclude gcc --exclude-dir oldcore --exclude-dir armv5tel + echo "Replace by MACHINE !" +fi + +grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --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-dir oldcore --exclude-dir aarch64 echo "Replace by MACHINE !" fi -- 2.39.5