From: Arne Fitzenreiter Date: Sat, 5 Feb 2022 08:59:08 +0000 (+0000) Subject: checkrootfiles: exclude some rust paks and fix armv6l X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66ea2015132889a8acbb52a4bd56da5884e499d6;p=people%2Fms%2Fipfire-2.x.git checkrootfiles: exclude some rust paks and fix armv6l some new rust packages contain files with x86_64 or aarch64 on all archictectures. They are now excluded from check. also this fix the check for armv6l. --- diff --git a/tools/checkrootfiles b/tools/checkrootfiles index a5288bf862..1a55a4da9b 100755 --- a/tools/checkrootfiles +++ b/tools/checkrootfiles @@ -33,23 +33,30 @@ if [ "${?}" == "0" ]; then echo "Comment this and create it at initskript if needed !" fi -grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude *linux* --exclude-dir oldcore --exclude-dir x86_64 >/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! '/x86_64' in rootfiles files found!" - grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude *linux* --exclude-dir oldcore --exclude-dir x86_64 + 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 --exclude-dir armv5tel >/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 --exclude-dir armv5tel + 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 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 >/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 + grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ + --exclude-dir oldcore --exclude-dir aarch64 echo "Replace by xxxMACHINExxx !" fi