Author: pierre
Date: Thu Jun 29 09:45:31 2017
New Revision: 3972
Log:
Make the date of the SBU_DU file the same as the one reported at the end of
the jhalfs run. Note that date is the one when the run is started
Modified:
jhalfs/trunk/CLFS/master.sh
jhalfs/trunk/CLFS2/master.sh
jhalfs/trunk/CLFS3/master.sh
jhalfs/trunk/HLFS/master.sh
jhalfs/trunk/LFS/master.sh
jhalfs/trunk/common/create-sbu_du-report.sh
Modified: jhalfs/trunk/CLFS/master.sh
==============================================================================
--- jhalfs/trunk/CLFS/master.sh Thu Jun 29 07:15:36 2017 (r3971)
+++ jhalfs/trunk/CLFS/master.sh Thu Jun 29 09:45:31 2017 (r3972)
@@ -1121,7 +1121,7 @@
create-sbu_du-report: mk_SYSTOOLS
@\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\
- ./create-sbu_du-report.sh logs $VERSION; \\
+ ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi;
@touch \$@
Modified: jhalfs/trunk/CLFS2/master.sh
==============================================================================
--- jhalfs/trunk/CLFS2/master.sh Thu Jun 29 07:15:36 2017 (r3971)
+++ jhalfs/trunk/CLFS2/master.sh Thu Jun 29 09:45:31 2017 (r3972)
@@ -502,7 +502,7 @@
create-sbu_du-report: mk_LUSER
@\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\
- ./create-sbu_du-report.sh logs $VERSION; \\
+ ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi;
@touch \$@
Modified: jhalfs/trunk/CLFS3/master.sh
==============================================================================
--- jhalfs/trunk/CLFS3/master.sh Thu Jun 29 07:15:36 2017 (r3971)
+++ jhalfs/trunk/CLFS3/master.sh Thu Jun 29 09:45:31 2017 (r3972)
@@ -551,7 +551,7 @@
create-sbu_du-report: mk_LUSER
@\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\
- ./create-sbu_du-report.sh logs $VERSION; \\
+ ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi;
@touch \$@
Modified: jhalfs/trunk/HLFS/master.sh
==============================================================================
--- jhalfs/trunk/HLFS/master.sh Thu Jun 29 07:15:36 2017 (r3971)
+++ jhalfs/trunk/HLFS/master.sh Thu Jun 29 09:45:31 2017 (r3972)
@@ -616,7 +616,7 @@
create-sbu_du-report: mk_BOOT
@\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\
- ./create-sbu_du-report.sh logs $VERSION; \\
+ ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi;
@touch \$@
Modified: jhalfs/trunk/LFS/master.sh
==============================================================================
--- jhalfs/trunk/LFS/master.sh Thu Jun 29 07:15:36 2017 (r3971)
+++ jhalfs/trunk/LFS/master.sh Thu Jun 29 09:45:31 2017 (r3972)
@@ -574,7 +574,7 @@
create-sbu_du-report: mk_BOOT
@\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\
- sudo ./create-sbu_du-report.sh logs $VERSION; \\
+ sudo ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi;
@touch \$@
Modified: jhalfs/trunk/common/create-sbu_du-report.sh
==============================================================================
--- jhalfs/trunk/common/create-sbu_du-report.sh Thu Jun 29 07:15:36 2017
(r3971)
+++ jhalfs/trunk/common/create-sbu_du-report.sh Thu Jun 29 09:45:31 2017
(r3972)
@@ -5,12 +5,13 @@
LOGSDIR=$1
VERSION=$2
+DATE=$3
LINE="================================================================================"
# Make sure that we have a directory as first argument
[[ ! -d "$LOGSDIR" ]] && \
- echo -e "\nUSAGE: create-sbu_du-report.sh logs_directory [book_version]\n"
&& exit
+ echo -e "\nUSAGE: create-sbu_du-report.sh logs_directory [book_version]
[date]\n" && exit
# Make sure that the first argument is a jhalfs logs directory
[[ ! -f "$LOGSDIR"/000-masterscript.log ]] && \
@@ -18,6 +19,7 @@
# If this script is run manually, the book version may be unknown
[[ -z "$VERSION" ]] && VERSION=unknown
+[[ -z "$DATE" ]] && DATE=$(date --iso-8601)
# If there is iteration logs directories, copy the logs inside iteration-1
# to the top level dir
@@ -25,7 +27,7 @@
cp $LOGSDIR/build_1/* $LOGSDIR
# Set the report file
-REPORT="$VERSION"-SBU_DU-$(date --iso-8601).report
+REPORT="$VERSION"-SBU_DU-"$DATE".report
[ -f $REPORT ] && : >$REPORT
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
