Changeset 621f01f for CLFS/master.sh

Timestamp:

09/16/2006 05:45:58 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

83c3752

Parents:

80f0ea1

Message:

Fixed create-sbu_du-report target run (I think)

File:

• CLFS/master.sh (modified) (6 diffs)

CLFS/master.sh

@@ -1001 +1001 @@
   done
 
-  # Add SBU-disk_usage report target if required
-  if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
-
 }
 
@@ -1076 +1073 @@
     PREV=$this_script
   done
-
-  # Add SBU-disk_usage report target if required
-  if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
-
 
 }
@@ -1185 +1178 @@
 cat << EOF
 
-all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS
+all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report
         @sudo make do-housekeeping
         @\$(call echo_finished,$VERSION)
@@ -1207 +1200 @@
         @\$(call echo_PHASE,Cross and Temporary Tools)
         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
+        @sudo make restore-luser-env
         @touch \$@
 
@@ -1239 +1233 @@
 CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
 
+do-housekeeping:
+        @-umount \$(MOUNT_PT)/dev/pts
+        @-umount \$(MOUNT_PT)/dev/shm
+        @-umount \$(MOUNT_PT)/dev
+        @-umount \$(MOUNT_PT)/sys
+        @-umount \$(MOUNT_PT)/proc
+        @-rm /tools /cross-tools
+        @-if [ ! -f luser-exist ]; then \\
+                userdel \$(LUSER); \\
+                rm -rf /home/\$(LUSER); \\
+        fi;
+
 EOF
 ) >> $MKFILE
+
+  # Add SBU-disk_usage report target
+  echo "create-sbu_du-report:" >> $MKFILE
+  if [[ "$REPORT" = "y" ]] ; then
+(
+    cat << EOF
+        @\$(call echo_message, Building)
+        @./create-sbu_du-report.sh logs $VERSION
+        @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
+        @touch  \$@
+
+EOF
+) >> $MKFILE
+  else echo -e "\t@true\n" >> $MKFILE; fi
+
 fi
 
@@ -1323 +1344 @@
         echo --------------------------------------------------------------------------------\$(WHITE)
 
-do-housekeeping:
-        @-umount \$(MOUNT_PT)/dev/pts
-        @-umount \$(MOUNT_PT)/dev/shm
-        @-umount \$(MOUNT_PT)/dev
-        @-umount \$(MOUNT_PT)/sys
-        @-umount \$(MOUNT_PT)/proc
-        @-rm /tools /cross-tools
-        @-if [ ! -f luser-exist ]; then \\
-                userdel \$(LUSER); \\
-                rm -rf /home/\$(LUSER); \\
-        fi;
-
 ########################################################