r2734 - in jhalfs/trunk: . CLFS HLFS LFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Wed May 31 13:43:42 PDT 2006


Author: manuel
Date: 2006-05-31 14:43:41 -0600 (Wed, 31 May 2006)
New Revision: 2734

Added:
   jhalfs/trunk/common/progress_bar.sh
Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/HLFS/master.sh
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/common-functions
   jhalfs/trunk/master.sh
Log:
POC for progress bar.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-05-30 13:06:53 UTC (rev 2733)
+++ jhalfs/trunk/CLFS/master.sh	2006-05-31 20:43:41 UTC (rev 2734)
@@ -991,6 +991,7 @@
 
 SRC= /sources
 MOUNT_PT= $BUILDDIR
+MAKE_PID=\`pidof make | cut -d " " -f1\`
 
 include makefile-functions
 

Modified: jhalfs/trunk/HLFS/master.sh
===================================================================
--- jhalfs/trunk/HLFS/master.sh	2006-05-30 13:06:53 UTC (rev 2733)
+++ jhalfs/trunk/HLFS/master.sh	2006-05-31 20:43:41 UTC (rev 2734)
@@ -478,6 +478,7 @@
 
 SRC= /sources
 MOUNT_PT= $BUILDDIR
+MAKE_PID=\`pidof make | cut -d " " -f1\`
 
 include makefile-functions
 
@@ -571,7 +572,7 @@
 		userdel lfs; \\
 		rm -rf /home/lfs; \\
 	fi;
-	
+
 EOF
 ) >> $MKFILE
 

Modified: jhalfs/trunk/LFS/master.sh
===================================================================
--- jhalfs/trunk/LFS/master.sh	2006-05-30 13:06:53 UTC (rev 2733)
+++ jhalfs/trunk/LFS/master.sh	2006-05-31 20:43:41 UTC (rev 2734)
@@ -355,6 +355,7 @@
 
 SRC= /sources
 MOUNT_PT= $BUILDDIR
+MAKE_PID=\`pidof make | cut -d " " -f1\`
 
 include makefile-functions
 
@@ -431,7 +432,7 @@
 	fi;
 	@chown lfs:lfs /home/lfs/.bash* && \\
 	touch \$@
-	
+
 do_housekeeping:
 	-umount \$(MOUNT_PT)/sys
 	-umount \$(MOUNT_PT)/proc
@@ -442,7 +443,7 @@
 		userdel lfs; \\
 		rm -rf /home/lfs; \\
 	fi;
-	
+
 EOF
 ) >> $MKFILE
 

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-05-30 13:06:53 UTC (rev 2733)
+++ jhalfs/trunk/common/common-functions	2006-05-31 20:43:41 UTC (rev 2734)
@@ -201,6 +201,7 @@
 
 $i:  $PREV
 	@\$(call echo_message, Building)
+	@./progress_bar.sh \$@ \$(MAKE_PID) &
 	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$LOGFILE
 EOF
 ) >> $MKFILE.tmp

Added: jhalfs/trunk/common/progress_bar.sh
===================================================================
--- jhalfs/trunk/common/progress_bar.sh	                        (rev 0)
+++ jhalfs/trunk/common/progress_bar.sh	2006-05-31 20:43:41 UTC (rev 2734)
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# $Id$
+
+set -e
+
+if [ ! -f $1 ] ; then
+  echo -n "."
+  sleep 1
+  if [ -d /proc/$2 ] ; then
+    ./$0 $1 $2
+  fi
+fi


Property changes on: jhalfs/trunk/common/progress_bar.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Revision Id

Modified: jhalfs/trunk/master.sh
===================================================================
--- jhalfs/trunk/master.sh	2006-05-30 13:06:53 UTC (rev 2733)
+++ jhalfs/trunk/master.sh	2006-05-31 20:43:41 UTC (rev 2734)
@@ -481,7 +481,7 @@
 #
 #
 if [[ "$PWD" != "$JHALFSDIR" ]]; then
-  cp $COMMON_DIR/makefile-functions $JHALFSDIR/
+  cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
   [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
   if [[ "$COMPARE" != "0" ]] ; then
     mkdir -p $JHALFSDIR/extras




More information about the alfs-log mailing list