From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 23 Jan 2025 07:37:34 +0000 (+0100)
Subject: rootfile consistency check: check also commented lines
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a23189d202df8c3b80e0594b0e4a1710f9831252;p=people%2Fstevee%2Fipfire-2.x.git

rootfile consistency check: check also commented lines

report also commented files to build rootfiles matching for all arches.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/make.sh b/make.sh
index 03e19fad6..b40530c5c 100755
--- a/make.sh
+++ b/make.sh
@@ -2183,7 +2183,15 @@ check_rootfiles_for_arch() {
 	# A list of files that are not scanned
 	# because they probably cause some false positives.
 	local excluded_files=(
+		abseil-cpp
+		cmake
+		gdb
+		liburcu
 		qemu
+		rust-memchr
+		rust-libc
+		rust-ppv-lite86
+		xfsprogs
 	)
 
 	# Exclude any architecture-specific directories
@@ -2198,9 +2206,9 @@ check_rootfiles_for_arch() {
 		args+=( "--exclude" "${x}" )
 	done
 
-	# Search for all files that contain the architecture, but exclude commented lines
+	# Search for all files that contain the architecture
 	local files=(
-		$(grep --files-with-matches -r "^[^#].*${arch}" "${args[@]}")
+		$(grep --files-with-matches -r "^.*${arch}" "${args[@]}")
 	)
 
 	local file
@@ -2518,6 +2526,11 @@ shell)
 	entershell
 	;;
 check)
+	# Check for rootfile consistency
+	if ! check_rootfiles; then
+		exiterror "Rootfiles are inconsistent"
+	fi
+
 	check_changed_rootfiles
 	;;
 clean)