X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=tools%2Fmake-functions;h=2bd85f166a6617df86102a92ec767f7a2fb94a5e;hp=9eb7219532166a826c163ff552551c0b1d5a6c53;hb=88f8491945dcb15e1fdc4dba231375736101d00a;hpb=96d7683ecbf5eee7251bbd1c12354b0728bd86ca

diff --git a/tools/make-functions b/tools/make-functions
index 9eb7219532..2bd85f166a 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  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        #
@@ -265,12 +265,13 @@ entershell() {
 		exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/"
 	fi
 	echo "Entering to a shell inside LFS chroot, go out with exit"
-	chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
+	$linux32 chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
 		PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
 		VERSION=$VERSION CONFIG_ROOT=$CONFIG_ROOT \
 		NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 		CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \
 		CCACHE_DIR=/usr/src/ccache \
+		CCACHE_COMPRESS=1 \
 		CCACHE_HASHDIR=1 \
 		KVER=$KVER \
 		BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
@@ -362,14 +363,14 @@ lfsmake2() {
 	[ $? == 1 ] && return 0
 
 	local PKG_TIME_START=`date +%s`
-	chroot $LFS /tools/bin/env -i 	HOME=/root \
+	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
 						VERSION=$VERSION \
 						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_COMPRESS=1 CCACHE_HASHDIR=1 \
 						KVER=$KVER MAKETUNING=$MAKETUNING \
 						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
 						IPFVER="$IPFVER" \
@@ -393,14 +394,15 @@ ipfiremake() {
 	[ $? == 1 ] && return 0
 
 	local PKG_TIME_START=`date +%s`
-	chroot $LFS /tools/bin/env -i 	HOME=/root \
+	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
 						VERSION=$VERSION \
+						CORE=$CORE \
 						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_COMPRESS=1 CCACHE_HASHDIR=1 \
 						KVER=$KVER MAKETUNING=$MAKETUNING \
 						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
 						IPFVER="$IPFVER" \
@@ -431,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_COMPRESS=1 CCACHE_HASHDIR=1 \
 					KVER=$KVER IPFVER="$IPFVER" \
 					BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
 					/bin/bash -x -c "cd /usr/src/lfs && \
@@ -454,7 +456,7 @@ installmake() {
 	[ $? == 1 ] && return 0
 
 	local PKG_TIME_START=`date +%s`
-		chroot $LFS /tools/bin/env -i 	HOME=/root \
+	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/opt/i586-uClibc/i586-linux-uclibc/bin:/opt/i586-uClibc/bin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
 						VERSION=$VERSION \
@@ -462,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_COMPRESS=1 CCACHE_HASHDIR=1 \
 						KVER=$KVER IPFVER="$IPFVER" \
 						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
 		    /bin/bash -x -c "cd /usr/src/lfs && \
@@ -496,7 +498,7 @@ batch_script() {
 		$0 clean
 		evaluate 1
 
-		$0 git update
+		$0 git update --force
 		evaluate 1 mail_me UPDATE
 
 		echo "### EXPORT SOURCES"
@@ -726,8 +728,12 @@ update_langs() {
 		chmod 755 $BASEDIR/tools/{check_strings.pl,sort_strings.pl,check_langs.sh}
 		$BASEDIR/tools/sort_strings.pl en
 		$BASEDIR/tools/sort_strings.pl de
+		$BASEDIR/tools/sort_strings.pl fr
+		$BASEDIR/tools/sort_strings.pl es
 		$BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en
 		$BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
+		$BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr
+		$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es
 		$BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
 		beautify message DONE
 }