From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 12 Oct 2024 09:34:45 +0000 (+0000)
Subject: make.sh: Show rootfiles that contain some architecture
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32ec5667d9a63b64ae39274af22b44eb4adc5fbd;p=people%2Fms%2Fipfire-2.x.git

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 <michael.tremer@ipfire.org>
---

diff --git a/make.sh b/make.sh
index c85d9dbb6..7129c36e7 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() {