From patchwork Tue May 16 12:20:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 6861 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QLFgm1391z3wlM for ; Tue, 16 May 2023 12:20:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QLFgk4XmNzjh; Tue, 16 May 2023 12:20:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QLFgk3JD2z2yXc; Tue, 16 May 2023 12:20:34 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QLFgj1tqlz2xKp for ; Tue, 16 May 2023 12:20:33 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4QLFgh1Gfhzf4; Tue, 16 May 2023 12:20:32 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1684239632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LFMIQZ386y81O88oYZMR4Ontp2uJz0Q09z6MigpEu44=; b=aU3E4G2eLv1JgaqWk0savGy/cRN4MjVdHXqG/2yHjpZnsoVVPNoL9HYB/l30aFdbfqf51g 5ri3K8DtpQElfoCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1684239632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LFMIQZ386y81O88oYZMR4Ontp2uJz0Q09z6MigpEu44=; b=Q9ZMZ7vPomC1bE6kOduZfXe5+eYtdm1lculCmT7x3cMsPLluxWWG+/X6D/52YIL6kL2Ho/ z0OmUu1rnMPFgmJ6G1uT2cadh8Acj92gstM9SZ1aEa8N9xEFSbGTPGhGGn3jaJs8RkYj1o GQiwYWvJHmDMv+Zx1ccOr6dasE6S8gqFuJLOANwDVigE0Fb/Rpovfaz43F5TvxFC8IT0Qf Pz5e0Gn+1ilISMZIz3/NZk9X0F3BU3RK4FMQTNcAdBjseKRFC4X/9a4sVzVNc2eOdGi5vs PMN8f3jsF3I6gN8N+/hIvnsCw69zeLuYFD2FpCmeir6qUgcSqFDoXzf7ETvx9Q== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] checkrootfiles: fix checks on hosts with newer grep Date: Tue, 16 May 2023 14:20:20 +0200 Message-Id: <20230516122020.15957-1-arne_f@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" newer grep versions ignore * in --exclude work around this by excluding all arch specific directories with --exclude-dir Signed-off-by: Arne Fitzenreiter --- tools/checkrootfiles | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/checkrootfiles b/tools/checkrootfiles index a2712808b..05b16f368 100755 --- a/tools/checkrootfiles +++ b/tools/checkrootfiles @@ -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