From 5359c48f8cabbc7f007d771dc22eab157d718ad9 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Mon, 24 Apr 2006 16:41:29 +0000
Subject: [PATCH] Merged r2570 and r2571 from trunk.

---
 common/common-functions | 145 +++++++++++++++++-----------------------
 1 file changed, 63 insertions(+), 82 deletions(-)

diff --git a/common/common-functions b/common/common-functions
index 3f2e513..b266241 100644
--- a/common/common-functions
+++ b/common/common-functions
@@ -201,7 +201,7 @@ HEADER="# This file is automatically generated by jhalfs-X
 
 
 #----------------------------------#
-wrt_target() {                     #
+wrt_target() {                     # Create target and initialize log file
 #----------------------------------#
   local i=$1
   local PREV=$2
@@ -210,6 +210,7 @@ cat << EOF
 
 $i:  $PREV
 	@\$(call echo_message, Building)
+	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$this_script
 EOF
 ) >> $MKFILE.tmp
 }
@@ -273,45 +274,94 @@ EOF
 
 
 #----------------------------------#
-wrt_run_as_su() {                  # header to log file, execute script, footer to log file
+wrt_run_as_su() {                  # Execute script inside time { }, footer to log file
 #----------------------------------#
   local this_script=$1
   local file=$2
 (
 cat << EOF
-	@echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$this_script && \\
-	su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 && \\
-	echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$this_script
+	@( time { su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
+	echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
 EOF
 ) >> $MKFILE.tmp
 }
 
 
 #----------------------------------#
-wrt_run_as_root() {                #
+wrt_run_as_root() {                # Some scripts must be run as root..
 #----------------------------------#
   local this_script=$1
   local file=$2
 (
 cat << EOF
-	@echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$this_script && \\
-	export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
-	echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$this_script
+	@( time { export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
+	echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
 EOF
 ) >> $MKFILE.tmp
 }
 
 
 #=============================#
-wrt_run_as_root2() {          # Some scripts must be run as root..
+wrt_run_as_root2() {          #
 #=============================#
   local this_script=$1
   local file=$2
 (
 cat << EOF
-	@echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \`\n" >logs/$this_script && \\
-	source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
-	echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \`\n" >>logs/$this_script
+	@( time { source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
+	echo -e "\nKB: \`du -skx --exclude=jhalfs \`\n" >>logs/$this_script
+EOF
+) >> $MKFILE.tmp
+}
+
+
+
+#----------------------------------#
+wrt_run_as_chroot1() {             #
+#----------------------------------#
+  local this_script=$1
+  local file=$2
+(
+    cat << EOF
+	@( time { \$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
+	echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
+EOF
+) >> $MKFILE.tmp
+}
+
+
+#----------------------------------#
+wrt_run_as_chroot2() {             #
+#----------------------------------#
+  local this_script=$1
+  local file=$2
+(
+cat << EOF
+	@( time { \$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
+	echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
+EOF
+) >> $MKFILE.tmp
+}
+
+
+#----------------------------------#
+wrt_copy_fstab() {                 #
+#----------------------------------#
+  local i=$1
+(
+    cat << EOF
+	@cp -v $FSTAB \$(MOUNT_PT)/etc/fstab >>logs/$i 2>&1
+EOF
+) >> $MKFILE.tmp
+}
+
+#----------------------------------#
+wrt_copy_fstab2() {                #
+#----------------------------------#
+  local i=$1
+(
+    cat << EOF
+	@cp -v /sources/fstab /etc/fstab >>logs/$i 2>&1
 EOF
 ) >> $MKFILE.tmp
 }
@@ -349,75 +399,6 @@ EOF
 }
 
 
-
-#----------------------------------#
-wrt_run_as_chroot1() {             #
-#----------------------------------#
-  local this_script=$1
-  local file=$2
-(
-    cat << EOF
-	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/${this_script} && \\
-	\$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' && \\
-	echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/${this_script}
-EOF
-) >> $MKFILE.tmp
-}
-
-
-#----------------------------------#
-wrt_run_as_chroot2() {             #
-#----------------------------------#
-  local this_script=$1
-  local file=$2
-(
-cat << EOF
-	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/${this_script} && \\
-	\$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' && \\
-	echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/${this_script}
-EOF
-) >> $MKFILE.tmp
-}
-
-
-#----------------------------------#
-wrt_copy_fstab() {                 #
-#----------------------------------#
-  local i=$1
-(
-    cat << EOF
-	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$i && \\
-	cp -v $FSTAB \$(MOUNT_PT)/etc/fstab >>logs/$i 2>&1 && \\
-	echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$i
-EOF
-) >> $MKFILE.tmp
-}
-
-#----------------------------------#
-wrt_copy_fstab2() {                 #
-#----------------------------------#
-  local i=$1
-(
-    cat << EOF
-	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >logs/$i && \\
-	cp -v /sources/fstab /etc/fstab >>logs/$i 2>&1 && \\
-	echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >>logs/$i
-EOF
-) >> $MKFILE.tmp
-}
-
-
-#----------------------------------#
-wrt_export_pkgdir() {              #
-#----------------------------------#
-(
-    cat << EOF
-	@echo "export PKGDIR=\$(SRC)/binutils-build" > envars
-EOF
-) >> $MKFILE.tmp
-}
-
-
 #----------------------------#
 run_make() {
 #----------------------------#