Changeset 125e05e

Timestamp:

02/28/2012 01:20:40 PM (12 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

9af9dfa

Parents:

8ea21f8

Message:

Update create-sbu-report so that it works with CLFS
and that it prints the last "Installed file size"

Files:

• common/create-sbu_du-report.sh (modified) (3 diffs)
• custom/examples/997-nasm (modified) (1 diff)

common/create-sbu_du-report.sh

@@ -52 +52 @@
 
 # Match the first timed log to extract the SBU unit value from it
-BASELOG=`grep -l "^Totalseconds:" $LOGSDIR/* | head -n1`
+FIRSTLOG=`grep -l "^Totalseconds:" $LOGSDIR/* | head -n1`
+BASELOG=`grep -l "^Totalseconds:" $LOGSDIR/???-binutils* | head -n1`
 echo -e "\nUsing ${BASELOG#*[[:digit:]]-} to obtain the SBU unit value."
 SBU_UNIT=`sed -n 's/^Totalseconds:\s\([[:digit:]]*\)$/\1/p' $BASELOG`
@@ -92 +93 @@
 # Append installed files disk usage to the previous entry,
 # except for the first parsed log
-  if [ "$log" != "$BASELOG" ] ; then
+  if [ "$log" != "$FIRSTLOG" ] ; then
     INSTALL=`perl -e 'print ('$DU1' - '$DU1PREV')';`
     INSTALLMB=`perl -e 'printf "%.3f" , ('$DU1MB' - '$DU1MBPREV')';`
@@ -116 +117 @@
 done
 
+# For printing the last 'Installed files disk usage', we need to 'du' the
+# root dir, excluding the jhalfs directory (and lost+found). We assume
+# that the rootdir is $LOGSDIR/../..
+DU1=`du -skx --exclude=jhalfs --exclude=lost+found $LOGSDIR/../.. | cut -f1`
+DU1MB=`perl -e 'printf "%.3f" , ('$DU1' / '1024')';`
+INSTALL=`perl -e 'print ('$DU1' - '$DU1PREV')';`
+INSTALLMB=`perl -e 'printf "%.3f" , ('$DU1MB' - '$DU1MBPREV')';`
+echo -e "Installed files disk usage:\t\t\t\t$INSTALL KB or $INSTALLMB MB\n" >> $REPORT
+# Append install values for grand total
+INSTALL2=`perl -e 'printf "%.3f" , ('$INSTALL2' + '$INSTALL')';`
+INSTALLMB2=`perl -e 'printf "%.3f" , ('$INSTALLMB2' + '$INSTALLMB')';`
+
 # Dump grand totals
 echo -e "\n$LINE\n\nTotal time required to build the systen:\t\t$SBU2  SBU" >> $REPORT

custom/examples/997-nasm

@@ -1 +1 @@
 #
-# $Id:$
+# $Id$
 # NASM (Netwide Assembler) is an 80x86 assembler designed
 # for portability and modularity. It includes a