Add rootfile check for hardcoded machine type.

diff --git a/make.sh b/make.sh
index db40b563e85cc48c106d6c6d29b8f87e25a92aa5..26f9d42172a6dfff4c6bddb4e413e2e4150dce05 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -978,7 +978,7 @@ build)
 
        cd $BASEDIR
        tools/checknewlog.pl
-       tools/checkwronginitlinks
+       tools/checkrootfiles
        cd $PWD
 
        beautify build_end

diff --git a/tools/checkwronginitlinks b/tools/checkrootfiles
similarity index 76%
rename from tools/checkwronginitlinks
rename to tools/checkrootfiles
index 65fc946b68e7b8c83e52d9be3309fdc4ca7821d0..74fab3e02310b6bce11bf37e8375f9bd02e7dea5 100755 (executable)
--- a/tools/checkwronginitlinks
+++ b/tools/checkrootfiles
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  info@ipfire.org                       #
+# Copyright (C) 2007-2015  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        #
@@ -32,3 +32,17 @@ if [ "${?}" == "0" ]; then
        grep -r "^var/run//*" ./config/rootfiles/
        echo "Comment this and create it at initskript if needed !"
 fi
+
+grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1
+if [ "${?}" == "0" ]; then
+       echo "Error! '/i586' in rootfiles files found!"
+       grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore
+       echo "Replace by MACHINE !"
+fi
+
+grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1
+if [ "${?}" == "0" ]; then
+       echo "Error! '/armv5tel' in rootfiles files found!"
+       grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore
+       echo "Replace by MACHINE !"
+fi