From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Aug 2024 09:33:31 +0000 (+0000)
Subject: make.sh: Refactor the broken rootfile check
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=deb9501433aa369df9bffdb64bc6446bd5431608;p=people%2Fmfischer%2Fipfire-2.x.git

make.sh: Refactor the broken rootfile check

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/make.sh b/make.sh
index cf12e4237..3faba3d76 100755
--- a/make.sh
+++ b/make.sh
@@ -2159,6 +2159,21 @@ exec_in_namespace() {
 		"${0}" "${args[@]}" "$@"
 }
 
+check_logfiles() {
+	print_headline "Checking Log Files..."
+
+	local file
+	for file in ${LOG_DIR}/*_missing_rootfile; do
+		file="${file##*/}"
+		file="${file/_missing_rootfile/}";
+
+		print_line "${file} is missing a rootfile"
+		print_status FAIL
+	done
+
+	return 0
+}
+
 # Set BASEDIR
 readonly BASEDIR="$(find_base)"
 
@@ -2354,10 +2369,12 @@ build)
 	# Build all packages
 	build_packages
 
+	# Check log files
+	check_logfiles
+
 	print_headline "Checking Logfiles for new Files"
 
 	pushd "${BASEDIR}" &>/dev/null
-	tools/checknewlog.pl
 	tools/checkrootfiles
 	popd &>/dev/null
 
diff --git a/tools/checknewlog.pl b/tools/checknewlog.pl
deleted file mode 100755
index e21fd6577..000000000
--- a/tools/checknewlog.pl
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-
-opendir(DIR, "./log") || die;
-my @FILES = readdir(DIR);
-closedir(DIR);
-
-foreach(@FILES) {
-#	print $_."\n";
-	my $Found = 0;
-
-	if ( $_ =~ /$\.log/ || $_ =~ /^\.+/  || $_=~ /-install/ || $_=~ /-tools/ || $_=~ /-config/ || $_=~ /-kmod-/|| $_=~ /u-boot-.*-1/|| $_=~ /coreutils/ || $_=~ /cmake/ || $_=~ /gcc-.*-libatomic/ || $_=~ /gdb/ || $_=~ /libsigc/ || $_ eq 'FILES' ){
-		next;
-	} elsif ( $_=~ /missing_rootfile/ ){
-		print "Rootfile for $_ missing!\n";
-	} else {
-		open(DATEI, "<./log/$_") || die "File not found";
-		my @Lines = <DATEI>;
-		close(DATEI);
-
-		foreach (@Lines){
-			if ( $_ =~ /^\+/ ){$Found=1;}
-		}
-
-		if ($Found){
-			print "Changes in $_ check rootfile!\n";
-		}
-	}
-}