Author: pierre
Date: Tue Jul 4 06:01:13 2017
New Revision: 3977
Log:
Package management: compute times and sizes without packing times and sizes
Modified:
jhalfs/branches/2.4/Config.in
jhalfs/branches/2.4/LFS/lfs.xsl
jhalfs/branches/2.4/common/create-sbu_du-report.sh
jhalfs/branches/2.4/common/libs/func_wrt_Makefile
Modified: jhalfs/branches/2.4/Config.in
==============================================================================
--- jhalfs/branches/2.4/Config.in Tue Jul 4 05:19:46 2017 (r3976)
+++ jhalfs/branches/2.4/Config.in Tue Jul 4 06:01:13 2017 (r3977)
@@ -953,7 +953,6 @@
depends !BOOK_BLFS
config REPORT
- depends !PKGMNGT
bool "Create SBU and disk usage report"
default y
Modified: jhalfs/branches/2.4/LFS/lfs.xsl
==============================================================================
--- jhalfs/branches/2.4/LFS/lfs.xsl Tue Jul 4 05:19:46 2017 (r3976)
+++ jhalfs/branches/2.4/LFS/lfs.xsl Tue Jul 4 06:01:13 2017 (r3977)
@@ -236,7 +236,9 @@
for dir in $PKG_DEST/{boot,etc,lib,bin,sbin}; do
[[ -z $(ls $dir) ]] && rmdir -v $dir
done
+PREV_SEC=${SECONDS}
packInstall
+SECONDS=${PREV_SEC}
rm -rf $PKG_DEST
</xsl:text>
</xsl:if>
@@ -308,7 +310,9 @@
@role != 'nodump']/userinput[@remap != 'adjust']"
mode="pkgmngt"/>
<xsl:if test="$dirname = 'chapter06'">
- <xsl:text>packInstall
+ <xsl:text>PREV_SEC=${SECONDS}
+packInstall
+SECONDS=${PREV_SEC}
rm -rf $PKG_DEST
</xsl:text>
</xsl:if>
@@ -489,7 +493,9 @@
<xsl:text>ZONEINFO=$PKG_DEST</xsl:text>
<xsl:copy-of select="substring-after(string(),'ZONEINFO=')"/>
<xsl:text>
+PREV_SEC=${SECONDS}
packInstall
+SECONDS=${PREV_SEC}
rm -rf $PKG_DEST
PKG_DEST=$OLD_PKG_DEST
unset OLD_PKG_DEST
Modified: jhalfs/branches/2.4/common/create-sbu_du-report.sh
==============================================================================
--- jhalfs/branches/2.4/common/create-sbu_du-report.sh Tue Jul 4 05:19:46
2017 (r3976)
+++ jhalfs/branches/2.4/common/create-sbu_du-report.sh Tue Jul 4 06:01:13
2017 (r3977)
@@ -121,7 +121,7 @@
# 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`
+DU1=`du -skx --exclude=jhalfs --exclude=lost+found --exclude /var/lib
$LOGSDIR/../.. | cut -f1`
DU1MB=`perl -e 'printf "%.3f" , ('$DU1' / '1024')';`
INSTALL=`perl -e 'print ('$DU1' - '$DU1PREV')';`
INSTALLMB=`perl -e 'printf "%.3f" , ('$DU1MB' - '$DU1MBPREV')';`
Modified: jhalfs/branches/2.4/common/libs/func_wrt_Makefile
==============================================================================
--- jhalfs/branches/2.4/common/libs/func_wrt_Makefile Tue Jul 4 05:19:46
2017 (r3976)
+++ jhalfs/branches/2.4/common/libs/func_wrt_Makefile Tue Jul 4 06:01:13
2017 (r3977)
@@ -39,7 +39,7 @@
SU_LUSER = sudo -u \$(LUSER) -i sh -c
LUSER_HOME = \$(LHOME)/\$(LUSER)
PRT_DU = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT)
--exclude=lost+found \$(MOUNT_PT) \`\n"
-PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT)
--exclude=lost+found / \`\n"
+PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT)
--exclude=lost+found --exclude /var/lib / \`\n"
ADD_REPORT = $REPORT
ADD_CUSTOM_TOOLS = $CUSTOM_TOOLS
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
