From: Michael Tremer Date: Mon, 30 Sep 2013 19:00:15 +0000 (+0200) Subject: Remove /var/ipfire/firebuild. X-Git-Tag: v2.15-beta1~222 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e2eb09157ee4e40b383319cfcf16ad69fc5d73d5 Remove /var/ipfire/firebuild. This file provides lots of bogous information and information about the build system that is not of much interest. --- diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index fb57482222..299d766459 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -88,15 +88,6 @@ if ( -d "/var/ipfire/langs/${language}/" ) { }; }; -### Read IPFire Buildversion -$FIREBUILD = "File not found: firebuild\n"; -if (open(MYFile, "<${swroot}/firebuild")) { - $FIREBUILD = ; - chomp($FIREBUILD); - $FIREBUILD = "(Build: $FIREBUILD)"; - close(MYFile); -}; - require "${swroot}/langs/en.pl"; require "${swroot}/langs/${language}.pl"; eval `/bin/cat /srv/web/ipfire/html/themes/$settings{'THEME'}/include/functions.pl`; diff --git a/config/rootfiles/common/armv5tel/installer b/config/rootfiles/common/armv5tel/installer index ef5e90154e..59b5a022ab 100644 --- a/config/rootfiles/common/armv5tel/installer +++ b/config/rootfiles/common/armv5tel/installer @@ -1,3 +1,2 @@ #etc/system-release #opt/pakfire/db/core/mine -#var/ipfire/firebuild diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 0e2cbb67b0..07916611e3 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -199,5 +199,4 @@ var/ipfire/wakeonlan var/ipfire/wireless #var/ipfire/wireless/config #var/ipfire/wireless/settings -var/ipfire/firebuild etc/system-release diff --git a/make.sh b/make.sh index 5cea8bb72e..e80a951085 100755 --- a/make.sh +++ b/make.sh @@ -773,14 +773,7 @@ buildipfire() { ipfiremake wavemon ipfiremake iptraf-ng ipfiremake iotop - echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild - cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild - echo >> $BASEDIR/build/var/ipfire/firebuild - git log -1 >> $BASEDIR/build/var/ipfire/firebuild - echo >> $BASEDIR/build/var/ipfire/firebuild - git status >> $BASEDIR/build/var/ipfire/firebuild - echo >> $BASEDIR/build/var/ipfire/firebuild - cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild + echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine if [ "$(git status -s | wc -l)" == "0" ]; then GIT_STATUS=""