Changeset 9272545

Timestamp:

07/30/2006 08:58:26 AM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

f83bcee

Parents:

e840d27

Message:

Some comments fixes.
Trailing spaces cleam-up.
Removed obsolete code.

File:

• HLFS/master.sh (modified) (8 diffs)

HLFS/master.sh

@@ -14 +14 @@
   local this_script=$2
   local file=$3
- 
+
 (
 cat << EOF
@@ -121 +121 @@
   fi
 
-  # NOTE: We use the hlfs username and groupname also in HLFS
   # If /home/hlfs is already present in the host, we asume that the
   # hlfs user and group are also presents in the host, and a backup
@@ -212 +211 @@
     chapter5="$chapter5 $this_script"
 
-    # Grab the name of the target (minus the -headers or -cross in the case of gcc
-    # and binutils in chapter 5)
-    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' `
+    # Grab the name of the target
+    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
 
     # Adjust 'name'
@@ -230 +228 @@
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    
+
     # This is a very special script and requires manual processing
     # NO Optimization allowed
@@ -261 +259 @@
     # Remove the build directory(ies) except if the package build fails
     # (so we can review config.cache, config.log, etc.)
-    # For Binutils the sources must be retained for some time.
     if [ "$pkg_tarball" != "" ] ; then
        wrt_remove_build_dirs "$name"
@@ -326 +323 @@
     name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
 
-    #
-    # Sed replacement to fix some rm command that could fail.
-    # That should be fixed in the book sources.
-    #
-    case $name in
-      glibc)  sed 's/rm /rm -f /' -i chapter06$N/$this_script        ;;
-    esac
-
     case $name in
       uclibc)  name="uClibc"   ;;
@@ -391 +380 @@
     fi
 
-    # In the mount of kernel filesystems we need to set LFS and not to use chroot.
+    # In the mount of kernel filesystems we need to set HLFS and not to use chroot.
     case "${this_script}" in
       *kernfs*)
@@ -635 +624 @@
 
 restart_code:
-        @echo ">>> This feature is experimental, BUGS may exist"        
-        
+        @echo ">>> This feature is experimental, BUGS may exist"
+
         @if [ ! -L /tools ]; then \\
           echo -e "\\nERROR::\\n /tools is NOT a symlink.. /tools must point to \$(MOUNT_PT)/tools\\n" && false;\\
         fi;
-        
+
         @if [ ! -e /tools ]; then \\
           echo -e "\\nERROR::\\nThe target /tools points to does not exist.\\nVerify the target.. \$(MOUNT_PT)/tools\\n" && false;\\
         fi;
-        
+
         @if ! stat -c %N /tools | grep "\$(MOUNT_PT)/tools" >/dev/null ; then \\
           echo -e "\\nERROR::\\nThe symlink \\"/tools\\" does not point to \\"\$(MOUNT_PT)/tools\\".\\nCorrect the problem and rerun\\n" && false;\\
-        fi;     
+        fi;
 
         @if [ -f ???-kernfs ]; then \\