From e0c923f424c0d4a8a8a873ee3f84a065ecce58f7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 25 Apr 2015 13:23:34 +0200 Subject: [PATCH] Add rootfile check for hardcoded machine type. --- make.sh | 2 +- tools/{checkwronginitlinks => checkrootfiles} | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) rename tools/{checkwronginitlinks => checkrootfiles} (76%) diff --git a/make.sh b/make.sh index db40b563e8..26f9d42172 100755 --- 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 65fc946b68..74fab3e023 100755 --- 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 -- 2.39.2