r2743 - in jhalfs/trunk: CLFS HLFS LFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Jun 1 14:54:20 PDT 2006


Author: manuel
Date: 2006-06-01 15:54:18 -0600 (Thu, 01 Jun 2006)
New Revision: 2743

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/HLFS/master.sh
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/common-functions
   jhalfs/trunk/common/progress_bar.sh
Log:
Using fuser instead of pidof to watch that make is alive.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-06-01 21:09:55 UTC (rev 2742)
+++ jhalfs/trunk/CLFS/master.sh	2006-06-01 21:54:18 UTC (rev 2743)
@@ -992,7 +992,6 @@
 SRC= /sources
 MOUNT_PT= $BUILDDIR
 PKG_LST= $PKG_LST
-MAKE_PID=\`pidof make | cut -d " " -f1\`
 
 include makefile-functions
 

Modified: jhalfs/trunk/HLFS/master.sh
===================================================================
--- jhalfs/trunk/HLFS/master.sh	2006-06-01 21:09:55 UTC (rev 2742)
+++ jhalfs/trunk/HLFS/master.sh	2006-06-01 21:54:18 UTC (rev 2743)
@@ -484,7 +484,6 @@
 SRC= /sources
 MOUNT_PT= $BUILDDIR
 PKG_LST= $PKG_LST
-MAKE_PID=\`pidof make | cut -d " " -f1\`
 
 include makefile-functions
 

Modified: jhalfs/trunk/LFS/master.sh
===================================================================
--- jhalfs/trunk/LFS/master.sh	2006-06-01 21:09:55 UTC (rev 2742)
+++ jhalfs/trunk/LFS/master.sh	2006-06-01 21:54:18 UTC (rev 2743)
@@ -356,7 +356,6 @@
 SRC= /sources
 MOUNT_PT= $BUILDDIR
 PKG_LST= $PKG_LST
-MAKE_PID=\`pidof make | cut -d " " -f1\`
 
 include makefile-functions
 

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-06-01 21:09:55 UTC (rev 2742)
+++ jhalfs/trunk/common/common-functions	2006-06-01 21:54:18 UTC (rev 2743)
@@ -201,7 +201,7 @@
 
 $i:  $PREV
 	@\$(call echo_message, Building)
-	@./progress_bar.sh \$@ \$(MAKE_PID) &
+	@./progress_bar.sh \$@ &
 	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >logs/$LOGFILE
 EOF
 ) >> $MKFILE.tmp

Modified: jhalfs/trunk/common/progress_bar.sh
===================================================================
--- jhalfs/trunk/common/progress_bar.sh	2006-06-01 21:09:55 UTC (rev 2742)
+++ jhalfs/trunk/common/progress_bar.sh	2006-06-01 21:54:18 UTC (rev 2743)
@@ -5,11 +5,11 @@
 set -e
 
 [[ -z $1 ]] && exit
-[[ -z $2 ]] && exit
 
 if [ ! -f $1 ] ; then
-  while [ -d /proc/$2 ] ; do
+  while fuser -v . 2>&1 | grep make >/dev/null ; do
     echo -n "."
     sleep 1
+    [[ -f $1 ]] && exit
   done
 fi




More information about the alfs-log mailing list