Changeset 0167dd8

Timestamp:

09/15/2006 07:01:44 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

80f0ea1

Parents:

df0277b

Message:

In do_housekeeping, remove also /tools and /cross-tools symlinks.
Trainling space clean-up.

Files:

• CLFS/master.sh (modified) (9 diffs)
• HLFS/master.sh (modified) (4 diffs)
• LFS/master.sh (modified) (2 diffs)

CLFS/master.sh

@@ -324 +324 @@
       *kernfs)     orphan_scripts="${orphan_scripts} ${this_script}"  ;;
       *)           chroottools="$chroottools $this_script"            ;;
-    esac    
+    esac
 
     # Grab the name of the target, strip id number, XXX-script
@@ -330 +330 @@
 
     pkg_tarball=$(get_package_tarball_name $name)
-    
+
     # This is very ugly:: util-linux is in /chroot but must be run under LUSER
-    # .. Customized makefile entry 
+    # .. Customized makefile entry
     case "${this_script}" in
-      *util-linux) 
+      *util-linux)
          LUSER_wrt_target "${this_script}" "$PREV"
          LUSER_wrt_unpack "$pkg_tarball"
@@ -392 +392 @@
 boot_Makefiles() {                     #
 #--------------------------------------#
-  
+
   echo "${tab_}${GREEN}Processing... ${L_arrow}tmptools BOOT  ( LUSER ) ${R_arrow}"
   #
@@ -1110 +1110 @@
   bootscripts_cmds=${METHOD}_bootscripts_Makefiles
      bootable_cmds=${METHOD}_bootable_Makefiles
-  
+
   host_prep_Makefiles        # mk_SETUP      (SETUP)  $host_prep
   cross_tools_Makefiles      # mk_CROSS      (LUSER)  $cross_tools
@@ -1200 +1200 @@
         @sudo make SETUP
         @touch \$@
-        
+
 #---------------AS LUSER
 mk_CROSS: mk_SETUP
@@ -1214 +1214 @@
 # chroot environment. (Unless someone knows a different way)
 # Manually create the /bin directory and provide link to the /tools dir.
-# Also change the original symlink creation to include (f)orce to prevent failure due to 
+# Also change the original symlink creation to include (f)orce to prevent failure due to
 #  pre-existing links.
 
 #---------------CHROOT JAIL
-mk_SYSTOOLS: mk_SUDO 
+mk_SYSTOOLS: mk_SUDO
         @if [ ! -e \$(MOUNT_PT)/bin ]; then \\
           mkdir \$(MOUNT_PT)/bin; \\
@@ -1275 +1275 @@
 
 #---------------AS LUSER
-        
+
 mk_CROSS: mk_SETUP
         @\$(call echo_PHASE,Cross Tool)
@@ -1293 +1293 @@
 
 SETUP:      $host_prep
-AS_LUSER:   $cross_tools $temptools ${chroottools}${boottools} 
+AS_LUSER:   $cross_tools $temptools ${chroottools}${boottools}
 SUDO:       $orphan_scripts
-AS_ROOT:    $testsuitetools $basicsystem $bootscripttools $bootabletools 
+AS_ROOT:    $testsuitetools $basicsystem $bootscripttools $bootabletools
 
 EOF
@@ -1327 +1327 @@
         @-umount \$(MOUNT_PT)/sys
         @-umount \$(MOUNT_PT)/proc
+        @-rm /tools /cross-tools
         @-if [ ! -f luser-exist ]; then \\
                 userdel \$(LUSER); \\

HLFS/master.sh

@@ -573 +573 @@
         @sudo make SETUP
         @touch \$@
-        
+
 mk_LUSER: mk_SETUP
         @\$(call echo_SULUSER_request)
@@ -583 +583 @@
         @sudo make SUDO
         @touch \$@
-        
-mk_CHROOT: mk_SUDO 
+
+mk_CHROOT: mk_SUDO
         @if [ ! -e \$(MOUNT_PT)/bin ]; then \\
           mkdir \$(MOUNT_PT)/bin; \\
@@ -595 +595 @@
         @touch \$@
 
-mk_BOOT: mk_CHROOT 
+mk_BOOT: mk_CHROOT
         @\$(call echo_CHROOT_request)
         @( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BOOT")
         @touch \$@
-        
+
 
 SETUP:  $chapter3
@@ -633 +633 @@
         @-umount \$(MOUNT_PT)/sys
         @-umount \$(MOUNT_PT)/proc
+        @-rm /tools
         @-if [ ! -f luser-exist ]; then \\
                 userdel \$(LUSER); \\

LFS/master.sh

@@ -447 +447 @@
           exit 1; \\
         fi
-        
+
 mk_SETUP:
         @\$(call echo_SU_request)
@@ -518 +518 @@
         @-umount \$(MOUNT_PT)/dev/pts
         @-umount \$(MOUNT_PT)/dev
+        @-rm /tools
         @-if [ ! -f luser-exist ]; then \\
                 userdel \$(LUSER); \\