From a3c645aa96b3942487c475dcba77f6d6f06ce861 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 26 Oct 2010 17:51:37 +0200 Subject: [PATCH 1/5] ccache: enabled cache compression. --- make.sh | 1 + tools/make-functions | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/make.sh b/make.sh index d5ec02c5a..dd3176a58 100755 --- a/make.sh +++ b/make.sh @@ -219,6 +219,7 @@ prepareenv() { # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache + export CCACHE_COMPRESSION=1 export CCACHE_HASHDIR=1 # Remove pre-install list of installed files in case user erase some files before rebuild diff --git a/tools/make-functions b/tools/make-functions index 00d7d337c..7ae1e6b37 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -271,6 +271,7 @@ entershell() { NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \ CCACHE_DIR=/usr/src/ccache \ + CCACHE_COMPRESSION=1 \ CCACHE_HASHDIR=1 \ KVER=$KVER \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ @@ -369,7 +370,7 @@ lfsmake2() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ - CCACHE_DIR=/usr/src/ccache CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESSION=1 CCACHE_HASHDIR=1 \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ IPFVER="$IPFVER" \ @@ -401,7 +402,7 @@ ipfiremake() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ - CCACHE_DIR=/usr/src/ccache CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESSION=1 CCACHE_HASHDIR=1 \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ IPFVER="$IPFVER" \ @@ -432,7 +433,7 @@ ipfiredist() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ - CCACHE_DIR=/usr/src/ccache CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESSION=1 CCACHE_HASHDIR=1 \ KVER=$KVER IPFVER="$IPFVER" \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ /bin/bash -x -c "cd /usr/src/lfs && \ @@ -463,7 +464,7 @@ installmake() { LFS_PASS="install" \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="-Os" CXXFLAGS="-Os" \ - CCACHE_DIR=/usr/src/ccache CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESSION=1 CCACHE_HASHDIR=1 \ KVER=$KVER IPFVER="$IPFVER" \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ /bin/bash -x -c "cd /usr/src/lfs && \ From 36d351ff3b607f2150e9cedb3e1563a2591e3bb7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 27 Oct 2010 22:00:42 +0200 Subject: [PATCH 2/5] Fix ccache compression parameter. --- make.sh | 2 +- tools/make-functions | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/make.sh b/make.sh index dd3176a58..06782e1e5 100755 --- a/make.sh +++ b/make.sh @@ -219,7 +219,7 @@ prepareenv() { # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache - export CCACHE_COMPRESSION=1 + export CCACHE_COMPRESS=1 export CCACHE_HASHDIR=1 # Remove pre-install list of installed files in case user erase some files before rebuild diff --git a/tools/make-functions b/tools/make-functions index 7ae1e6b37..4bf414079 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -271,7 +271,7 @@ entershell() { NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \ CCACHE_DIR=/usr/src/ccache \ - CCACHE_COMPRESSION=1 \ + CCACHE_COMPRESS=1 \ CCACHE_HASHDIR=1 \ KVER=$KVER \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ @@ -370,7 +370,7 @@ lfsmake2() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESSION=1 CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ IPFVER="$IPFVER" \ @@ -402,7 +402,7 @@ ipfiremake() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESSION=1 CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ IPFVER="$IPFVER" \ @@ -433,7 +433,7 @@ ipfiredist() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESSION=1 CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \ KVER=$KVER IPFVER="$IPFVER" \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ /bin/bash -x -c "cd /usr/src/lfs && \ @@ -464,7 +464,7 @@ installmake() { LFS_PASS="install" \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="-Os" CXXFLAGS="-Os" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESSION=1 CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \ KVER=$KVER IPFVER="$IPFVER" \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ /bin/bash -x -c "cd /usr/src/lfs && \ From b675537a691e1ffeb532b43c6fea1654b421f27b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 30 Oct 2010 14:52:47 +0200 Subject: [PATCH 3/5] lang fr: fix idle cpu was showed as used cpu time. --- langs/fr/cgi-bin/fr.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 0179e73da..70ef2149c 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -543,13 +543,13 @@ 'could not open update information file' => 'Impossible d\'ouvrir le fichier d\'information de mise à jour. Le fichier est corrompu.', 'could not retrieve common name from certificate' => 'Impossible de récupérer le nom courant depuis le certificat.', 'country' => 'Pays', -'cpu idle usage' => 'Utilisation du CPU', +'cpu idle usage' => 'Pourcentage d\'inactivite CPU', 'cpu interrupt usage' => 'Utilisation des interruptions CPU', 'cpu iowait usage' => 'Le COU attend des IO', 'cpu irq usage' => 'Utilisation CPU IRQ', 'cpu nice usage' => 'Utilisation CPU Nice', 'cpu steal usage' => 'Utilisation CPU Steal', -'cpu system usage' => 'Utilisation CPU Système', +'cpu system usage' => 'Utilisation CPU Systeme', 'cpu usage per' => 'Utilisation du CPU par', 'cpu user usage' => 'Utilisation du CPU par l\'utilisateur', 'create' => 'Créer', From 9bddee0a1d355a417f5511d84f23a044aa6d3825 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 30 Oct 2010 15:00:05 +0200 Subject: [PATCH 4/5] Finisched core41. --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 06782e1e5..fcc4e046a 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.7" # Version number CORE="41" # Core Level (Filename) -PAKFIRE_CORE="40" # Core Level (PAKFIRE) +PAKFIRE_CORE="41" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir From 4b8ede3119e17390a0ca799f39ef31d6bdfb1905 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 30 Oct 2010 15:05:10 +0200 Subject: [PATCH 5/5] Start core42. --- config/rootfiles/core/42/exclude | 0 config/rootfiles/core/42/filelists/files | 1 + config/rootfiles/core/42/meta | 1 + config/rootfiles/core/42/update.sh | 48 ++++++++++++++++++++++++ make.sh | 2 +- 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/42/exclude create mode 100644 config/rootfiles/core/42/filelists/files create mode 100644 config/rootfiles/core/42/meta create mode 100644 config/rootfiles/core/42/update.sh diff --git a/config/rootfiles/core/42/exclude b/config/rootfiles/core/42/exclude new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/42/filelists/files b/config/rootfiles/core/42/filelists/files new file mode 100644 index 000000000..0037af183 --- /dev/null +++ b/config/rootfiles/core/42/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/42/meta b/config/rootfiles/core/42/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/42/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/42/update.sh b/config/rootfiles/core/42/update.sh new file mode 100644 index 000000000..6b54995df --- /dev/null +++ b/config/rootfiles/core/42/update.sh @@ -0,0 +1,48 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.15-ipfire +#depmod 2.6.32.15-ipfire-xen + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index fcc4e046a..03cf93736 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.7" # Version number -CORE="41" # Core Level (Filename) +CORE="42" # Core Level (Filename) PAKFIRE_CORE="41" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan