the updatescript also contains this string so the check produce a false positive.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org --- tools/checkrootfiles | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/checkrootfiles b/tools/checkrootfiles index 1a55a4da9..33bfb16e0 100755 --- a/tools/checkrootfiles +++ b/tools/checkrootfiles @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -35,11 +35,13 @@ fi
grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ --exclude rust-ppv-lite86 --exclude rust-memchr --exclude *linux* \ + --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 update.sh \ --exclude-dir oldcore --exclude-dir x86_64 echo "Replace by xxxMACHINExxx !" fi
Hello,
Is this check the right way to go if the list of exceptions is becoming longer and longer?
-Michael
On 19 Jul 2022, at 17:52, Arne Fitzenreiter arne_f@ipfire.org wrote:
the updatescript also contains this string so the check produce a false positive.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
tools/checkrootfiles | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/checkrootfiles b/tools/checkrootfiles index 1a55a4da9..33bfb16e0 100755 --- a/tools/checkrootfiles +++ b/tools/checkrootfiles @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -35,11 +35,13 @@ fi
grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ --exclude rust-ppv-lite86 --exclude rust-memchr --exclude *linux* \
- --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 update.sh \ --exclude-dir oldcore --exclude-dir x86_64 echo "Replace by xxxMACHINExxx !"
fi
2.36.1