From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 a23189d202df8c3b80e0594b0e4a1710f9831252
Date: Thu, 23 Jan 2025 09:09:18 +0000
Message-ID: <4Ydw9p2H5Yz2xPM@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6290442753301639338=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============6290442753301639338==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  a23189d202df8c3b80e0594b0e4a1710f9831252 (commit)
      from  3e85c21e8a122c041245ac06f6d2e65b955e522d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a23189d202df8c3b80e0594b0e4a1710f9831252
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jan 23 08:37:34 2025 +0100

    rootfile consistency check: check also commented lines
   =20
    report also commented files to build rootfiles matching for all arches.
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 make.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Difference in files:
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=3D(
+		abseil-cpp
+		cmake
+		gdb
+		liburcu
 		qemu
+		rust-memchr
+		rust-libc
+		rust-ppv-lite86
+		xfsprogs
 	)
=20
 	# Exclude any architecture-specific directories
@@ -2198,9 +2206,9 @@ check_rootfiles_for_arch() {
 		args+=3D( "--exclude" "${x}" )
 	done
=20
-	# Search for all files that contain the architecture, but exclude commented=
 lines
+	# Search for all files that contain the architecture
 	local files=3D(
-		$(grep --files-with-matches -r "^[^#].*${arch}" "${args[@]}")
+		$(grep --files-with-matches -r "^.*${arch}" "${args[@]}")
 	)
=20
 	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)


hooks/post-receive
--
IPFire 2.x development tree

--===============6290442753301639338==--