From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Mon, 2 Oct 2006 20:48:09 +0000 (+0000)
Subject: Zwischencommit LFS - Stoppt bei Stage2 - Binutils.
X-Git-Tag: v2.3-beta1~952
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e22c79733eaa73eb0a2817473f6ef261f789b508

Zwischencommit LFS - Stoppt bei Stage2 - Binutils.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@302 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/lfs/binutils b/lfs/binutils
index 0024e5ef73..2b92d78db3 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -44,7 +44,7 @@ else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = --prefix=/tools --disable-nls
-  EXTRA_MAKE = #LDFLAGS="-all-static"
+  EXTRA_MAKE = LDFLAGS="-all-static"
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@ -94,7 +94,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/binutils-build
 	cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-	cd $(DIR_SRC)/binutils-build && make  $(EXTRA_MAKE) #$(MAKETUNING)
+ifeq "$(PASS)" "1"
+	cd $(DIR_SRC)/binutils-build && make configure-host
+#	cd $(DIR_SRC)/binutils-build && make $(MAKETUNING)
+#	cd $(DIR_SRC)/binutils-build && make clean
+endif
+	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) #$(MAKETUNING)
 	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
 	cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include
diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index 1a12518871..a5cffbb259 100644
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -52,9 +52,7 @@ md5 :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 ifeq "$(PASS)" "1"
-	cp -v /tools/bin/{ld,ld-old.bak}
 	mv -v /tools/bin/{ld,ld-old}
-	cp -v /tools/i686-pc-linux-gnu/bin/{ld,ld-old.bak}
 	mv -v /tools/i686-pc-linux-gnu/bin/{ld,ld-old}
 	cp -v /tools/bin/{ld-new,ld}
 	ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld
@@ -66,11 +64,9 @@ ifeq "$(PASS)" "1"
 	rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/include/*`
 endif
 ifeq "$(PASS)" "2"
-	### I have to check if this really works
 	-strip --strip-debug /tools/lib/*
 	-strip --strip-unneeded /tools/{,s}bin/*
 	rm -rfv /tools/{info,man} /usr/local/man
-	cp -fv /tools/bin/{ld-old.bak,ld}
 	chown -R root:root /tools
 endif
 ifeq "$(PASS)" "3"
diff --git a/lfs/gcc b/lfs/gcc
index c0e8cd386e..aa21cdaa67 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -52,7 +52,7 @@ ifeq "$(PASS)" "1"
   EXTRA_CONFIG = --prefix=/tools \
     --with-local-prefix=/tools --disable-nls --enable-shared \
     --enable-languages=c
-  EXTRA_MAKE = BOOT_LDFLAGS="-static" bootstrap
+  EXTRA_MAKE = bootstrap #BOOT_LDFLAGS="-static"
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
diff --git a/lfs/glibc b/lfs/glibc
index eb3c5b0546..92b359f022 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -51,8 +51,8 @@ else
     --enable-kernel=2.6.0 --with-binutils=/tools/bin \
     --without-gd --with-headers=/tools/include \
     --without-selinux
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+  EXTRA_MAKE =
+  EXTRA_INSTALL =
 endif
 
 ###############################################################################
diff --git a/lfs/unicorn b/lfs/unicorn
index bc16da1fc5..f89e893c8b 100644
--- a/lfs/unicorn
+++ b/lfs/unicorn
@@ -36,7 +36,7 @@ VER        = 0.9.3
 
 THISAPP    = bast-$(VER)
 DL_FILE    = A1012-A1006-A904-A888-A983-$(VER).tgz
-DL_FROM    = http://www.bewan.com/bewan/drivers
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/unicorn
 ifeq "$(SMP)" ""
   TARGET     = $(DIR_INFO)/$(THISAPP)
diff --git a/make.sh b/make.sh
index 4a97264ac1..c20f82c301 100644
--- a/make.sh
+++ b/make.sh
@@ -820,33 +820,39 @@ prefetch)
 		cd $BASEDIR/lfs
 		for i in *; do
 			if [ -f "$i" -a "$i" != "Config" ]; then
+				echo -ne "Loading $i"
 				make -s -f $i LFS_BASEDIR=$BASEDIR MESSAGE="$i\t ($c/$MAX_RETRIES)" download >> $LOGFILE 2>&1
 				if [ $? -ne 0 ]; then
-					echo "Prefetch : wget error in lfs/$i"
+					beautify message FAIL
 					FINISHED=0
 				else
 					if [ $c -eq 1 ]; then
-						echo "Prefetch : lfs/$i files loaded"
+					beautify message DONE
 					fi
 				fi
 			fi
 		done
 	done
-	echo "Prefetch : verifying md5sum"
+	echo -e "${BOLD}***Verifying md5sums${NORMAL}"
 	ERROR=0
 	for i in *; do
 		if [ -f "$i" -a "$i" != "Config" ]; then
 			make -s -f $i LFS_BASEDIR=$BASEDIR MESSAGE="$i\t " md5 >> $LOGFILE 2>&1
 			if [ $? -ne 0 ]; then
-				echo "md5 difference in lfs/$i"
+				echo -ne "MD5 difference in lfs/$i"
+				beautify message FAIL
 				ERROR=1
 			fi
 		fi
 	done
 	if [ $ERROR -eq 0 ]; then
-		echo "Prefetch : all files md5sum match"
+		echo -ne "${BOLD}all files md5sum match${NORMAL}"
+		beautify message DONE
+	else
+		echo -ne "${BOLD}not all files were correctly download${NORMAL}"
+		beautify message FAIL
 	fi
-	cd -
+	cd - >/dev/null 2>&1
 	;;
 toolchain)
 	prepareenv