X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=tools%2Fmake-functions;h=530cd4737260e882283b341ee7400b43fefad86b;hp=c41f4c69a5cd1f428659742b205a537ab3048456;hb=c331896e29394556a9e620147212d52cf55e70d5;hpb=b3ffe3d85c710ef8d77900917e80fda830cc8ddf

diff --git a/tools/make-functions b/tools/make-functions
index c41f4c69a5..530cd47372 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_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 && \
@@ -492,9 +494,11 @@ batch_script() {
 
 	if [ "$IPFIRE_REBUILD" -eq "0" ]; then
 		export IPFIRE_START_TIME=`date`
+
+		$0 clean
 		evaluate 1
 
-		$0 git update
+		$0 git update --force
 		evaluate 1 mail_me UPDATE
 
 		echo "### EXPORT SOURCES"
@@ -507,12 +511,12 @@ batch_script() {
 	evaluate 1 mail_me ERROR
 
 	echo "### UPLOADING ISO"
-	#$0 upload iso
-	#evaluate 1 mail_me ISO
+	$0 upload iso
+	evaluate 1 mail_me ISO
 	
 	echo -ne "### UPLOADING PAKS"
-	#$0 upload paks
-	#evaluate 1 mail_me PAKS
+	$0 upload paks
+	evaluate 1 mail_me PAKS
 
 	echo -ne "${BOLD}***SUCCESS!${NORMAL}"
 	mail_me success