From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 26 May 2008 18:19:52 +0000 (+0200)
Subject: Made the toolchain download showing its progress.
X-Git-Tag: v3.0-alpha1~991
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4155cdb9b282d0d2da9f77064217aae4bfa6bd5;p=ipfire-3.x.git

Made the toolchain download showing its progress.

We also let it use the tools/downloader script
that automatically checks the md5sum on download.
---

diff --git a/tools/make-include b/tools/make-include
index 8e118249b..492d92175 100644
--- a/tools/make-include
+++ b/tools/make-include
@@ -684,6 +684,7 @@ prepareenv() {
 	# Make some extra directories
 	mkdir -p $BASEDIR/build_${MACHINE}/{$TOOLS_DIR,$CTOOLS_DIR,cdrom} 2>/dev/null
 	mkdir -p $BASEDIR/{cache,ccache,distcc} 2>/dev/null
+	mkdir -p $BASEDIR/cache/toolchains 2>/dev/null
 	mkdir -p $LFS/{$TOOLS_DIR/usr,$CTOOLS_DIR,usr/src} 2>/dev/null
 	mkdir -p $LFS/dev/pts
 	mkdir -p $LFS/proc
@@ -751,12 +752,8 @@ build() {
 			toolchain_build
 		else
 			echo "Restore from $PACKAGE"
-			if [ `md5sum $BASEDIR/cache/toolchains/$PACKAGE | awk '{print $1}'` == `cat $BASEDIR/cache/toolchains/$TOOLCHAINNAME.md5 | awk '{print $1}'` ]; then
-				cd $BASEDIR && tar jxf $BASEDIR/cache/toolchains/$PACKAGE
-				prepareenv
-			else
-				exiterror "$TOOLCHAINNAME md5 did not match, check downloaded package"
-			fi
+			cd $BASEDIR && tar jxf $BASEDIR/cache/toolchains/$PACKAGE
+			prepareenv
 		fi
 	fi
 	
diff --git a/tools/make-interactive b/tools/make-interactive
index 0c78ee70b..89875a21b 100644
--- a/tools/make-interactive
+++ b/tools/make-interactive
@@ -140,32 +140,29 @@ toolchain)
 	beautify message DONE
 	echo `ls -sh cache/toolchains/$TOOLCHAINNAME.tar.bz2`
 	md5sum cache/toolchains/$TOOLCHAINNAME.tar.bz2 \
-		> cache/toolchains/$TOOLCHAINNAME.md5
-
+		> cache/toolchains/$TOOLCHAINNAME.tar.bz2.md5
 	stdumount
 	;;
 	
 gettoolchain)
 	if [ ! -f $BASEDIR/cache/toolchains/$TOOLCHAINNAME.tar.bz2 ]; then
-		URL_TOOLCHAIN=`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'`
-		test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains
+		URL_TOOLCHAIN=$(grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }')
+		DIR_TOOLCHAIN="$BASEDIR/cache/toolchains"
+
 		echo "Loading toolchain for $MACHINE"
-		cd $BASEDIR/cache/toolchains
-		wget -c -nv $URL_TOOLCHAIN/$TOOLCHAINNAME.tar.bz2 $URL_TOOLCHAIN/$TOOLCHAINNAME.md5
-		if [ $? -ne 0 ]; then
-			echo -n "ERROR: Downloading toolchain for $MACHINE machine"
+		BASEDIR=$BASEDIR DIR_TMP=/tmp DIR_DL=$DIR_TOOLCHAIN \
+			sh $BASEDIR/tools/downloader $URL_TOOLCHAIN $TOOLCHAINNAME.tar.bz2
+
+		if [ $? -eq 0 ]; then
+			echo -n "Toolchain was successfully downloaded"
+			beautify message DONE
+		else
+			echo -n "ERROR: Downloading toolchain \"$TOOLCHAINNAME\""
 			beautify message FAIL
 			echo "Precompiled toolchain not always available for every machine"
-		else
-			if [ "`md5sum $TOOLCHAINNAME.tar.bz2 | awk '{print $1}'`" = "`cat $TOOLCHAINNAME.md5 | awk '{print $1}'`" ]; then
-				beautify message DONE
-				echo "Toolchain md5 ok"
-			else
-				exiterror "$TOOLCHAINNAME.md5 did not match, check downloaded package"
-			fi
 		fi
 	else
-		echo -n "Toolchain for $MACHINE is already existing"
+		echo -n "Toolchain \"$TOOLCHAINNAME\" is already existing"
 		beautify message SKIP
 	fi
 	;;