From 32ec5667d9a63b64ae39274af22b44eb4adc5fbd Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 12 Oct 2024 09:34:45 +0000 Subject: [PATCH] make.sh: Show rootfiles that contain some architecture Previously, make.sh just failed but did not explain why it was unhappy. This patch adds a message which rootfiles contain which architecture. Signed-off-by: Michael Tremer --- make.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/make.sh b/make.sh index c85d9dbb66..7129c36e7e 100755 --- a/make.sh +++ b/make.sh @@ -2197,12 +2197,18 @@ check_rootfiles_for_arch() { args+=( "--exclude" "${x}" ) done - # Search for all lines that contain the architecture, but exclude commented lines - if grep -r "^[^#].*${arch}" "${args[@]}"; then - return 1 - fi + # Search for all files that contain the architecture, but exclude commented lines + local files=( + $(grep --files-with-matches -r "^[^#].*${arch}" "${args[@]}") + ) - return 0 + local file + for file in ${files[@]}; do + print_line "${file} contains ${arch}" + print_status FAIL + done + + return "${#files[@]}" } check_rootfiles_for_pattern() { -- 2.39.5