From abe936de875cc89110b083f2ae048dbe7114bec4 Mon Sep 17 00:00:00 2001
From: George Boudreau <georgeb@linuxfromscratch.org>
Date: Fri, 10 Feb 2006 11:53:29 +0000
Subject: [PATCH] No longer need to retain binutils source package

---
 jhalfs | 71 +++++++++-------------------------------------------------
 1 file changed, 11 insertions(+), 60 deletions(-)

diff --git a/jhalfs b/jhalfs
index 0233dc3..b267f93 100755
--- a/jhalfs
+++ b/jhalfs
@@ -424,6 +424,11 @@ chapter5_Makefiles() {
       continue
     fi
 
+    # Should be handled inside xsl script
+    if [[ `_IS_ $i adjusting` ]]; then
+      sed '/cd $PKGDIR/d' -i chapter05/$i
+    fi
+
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
     chapter5="$chapter5 $i"
@@ -465,36 +470,10 @@ EOF
 	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 	chown -R lfs \$(LFS)\$(SRC)/\$\$ROOT && \\
 	echo "PKGDIR=\$(LFS)\$(SRC)/\$\$ROOT" > envars && \\
-	echo "export PKGDIR" >> envars && \\
-EOF
-) >> $MKFILE.tmp
-
-    fi
-
-    # Dump the path to the Binutils sources directory.
-    if [[ `_IS_ $i binutils` ]] ; then
-(
-    cat << EOF
-	echo "\$(LFS)\$(SRC)/\$\$ROOT" > sources-dir
-EOF
-) >> $MKFILE.tmp
-
-    # For the Adjusting phase we must to cd to the binutils-build directory.
-    elif [[ `_IS_ $i adjusting` ]] ; then
-(
-    cat << EOF
-	@echo "PKGDIR=\$(LFS)\$(SRC)/binutils-build" > envars && \\
 	echo "export PKGDIR" >> envars
 EOF
 ) >> $MKFILE.tmp
 
-    # Everything else, add a true statment so we don't confuse make
-    else
-(
-    cat << EOF
-	true
-EOF
-) >> $MKFILE.tmp
     fi
 
     # Insert date and disk usage at the top of the log file, the script run
@@ -511,7 +490,6 @@ EOF
     # (so we can review config.cache, config.log, etc.)
     # For Binutils the sources must be retained for some time.
     if [ "$vrs" != "" ] ; then
-      if [[ ! `_IS_ $i binutils` ]] ; then
 (
     cat << EOF
 	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
@@ -520,18 +498,6 @@ EOF
 		rm -r \$(LFS)\$(SRC)/$name-build; \\
 	fi;
 EOF
-) >> $MKFILE.tmp
-      fi
-    fi
-
-    # Remove the Binutils pass 1 sources after a successful Adjusting phase.
-    if [[ `_IS_ $i adjusting` ]] ; then
-(
-    cat << EOF
-	@rm -r \`cat sources-dir\` && \\
-	rm -r \$(LFS)\$(SRC)/binutils-build && \\
-	rm sources-dir
-EOF
 ) >> $MKFILE.tmp
     fi
 
@@ -566,6 +532,11 @@ chapter6_Makefiles() {
       continue
     fi
 
+    # Should be handled by xsl script
+    if [[ `_IS_ $i adjusting` ]]; then
+      sed '/cd $PKGDIR/d' -i chapter06/$i
+    fi
+
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
     chapter6="$chapter6 $i"
@@ -601,17 +572,8 @@ EOF
 ) >> $MKFILE.tmp
     fi
 
-    # For the Re-Adjusting phase we must to cd to the binutils-build directory.
-    if [[ `_IS_ $i readjusting` ]] ; then
-(
-    cat << EOF
-	@echo "PKGDIR=\$(SRC)/binutils-build" > envars && \\
-	echo "export PKGDIR" >> envars
-EOF
-) >> $MKFILE.tmp
-
     # For Glibc we need to set TIMEZONE envar.
-    elif [[ `_IS_ $i glibc` ]] ; then
+    if [[ `_IS_ $i glibc` ]] ; then
 (
     cat << EOF
 	@echo "TIMEZONE=\$(TIMEZONE)" >> envars && \\
@@ -664,17 +626,6 @@ EOF
 ) >> $MKFILE.tmp
     fi
 
-    # Remove the Binutils pass 2 sources after a successful Re-Adjusting phase.
-    if [[ `_IS_ $i readjusting` ]] ; then
-(
-    cat << EOF
-	@rm -r \`cat sources-dir\` && \\
-	rm -r \$(LFS)\$(SRC)/binutils-build && \\
-	rm sources-dir
-EOF
-) >> $MKFILE.tmp
-    fi
-
     # Include a touch of the target name so make can check
     # if it's already been made.
 (