Author: pierre
Date: Thu Jun 29 10:01:00 2017
New Revision: 3974
Log:
merge trunk r3972-3973
Modified:
jhalfs/branches/2.4/BLFS/gen_pkg_book.sh
jhalfs/branches/2.4/CLFS/master.sh
jhalfs/branches/2.4/CLFS2/master.sh
jhalfs/branches/2.4/CLFS3/master.sh
jhalfs/branches/2.4/HLFS/master.sh
jhalfs/branches/2.4/LFS/master.sh
jhalfs/branches/2.4/common/create-sbu_du-report.sh
jhalfs/branches/2.4/common/libs/func_book_parser
Modified: jhalfs/branches/2.4/BLFS/gen_pkg_book.sh
==============================================================================
--- jhalfs/branches/2.4/BLFS/gen_pkg_book.sh Thu Jun 29 09:54:28 2017
(r3973)
+++ jhalfs/branches/2.4/BLFS/gen_pkg_book.sh Thu Jun 29 10:01:00 2017
(r3974)
@@ -178,7 +178,7 @@
echo -en "\n\tGenerating the build scripts ...\n"
rm -rf scripts
xsltproc --xinclude --nonet \
- --stringparam sudo $SUDO \
+ --stringparam sudo "$SUDO" \
-o ./scripts/ ${MakeScripts} \
${BookXml}
# Make the scripts executable.
Modified: jhalfs/branches/2.4/CLFS/master.sh
==============================================================================
--- jhalfs/branches/2.4/CLFS/master.sh Thu Jun 29 09:54:28 2017 (r3973)
+++ jhalfs/branches/2.4/CLFS/master.sh Thu Jun 29 10:01:00 2017 (r3974)
@@ -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/branches/2.4/CLFS2/master.sh
==============================================================================
--- jhalfs/branches/2.4/CLFS2/master.sh Thu Jun 29 09:54:28 2017 (r3973)
+++ jhalfs/branches/2.4/CLFS2/master.sh Thu Jun 29 10:01:00 2017 (r3974)
@@ -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/branches/2.4/CLFS3/master.sh
==============================================================================
--- jhalfs/branches/2.4/CLFS3/master.sh Thu Jun 29 09:54:28 2017 (r3973)
+++ jhalfs/branches/2.4/CLFS3/master.sh Thu Jun 29 10:01:00 2017 (r3974)
@@ -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/branches/2.4/HLFS/master.sh
==============================================================================
--- jhalfs/branches/2.4/HLFS/master.sh Thu Jun 29 09:54:28 2017 (r3973)
+++ jhalfs/branches/2.4/HLFS/master.sh Thu Jun 29 10:01:00 2017 (r3974)
@@ -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/branches/2.4/LFS/master.sh
==============================================================================
--- jhalfs/branches/2.4/LFS/master.sh Thu Jun 29 09:54:28 2017 (r3973)
+++ jhalfs/branches/2.4/LFS/master.sh Thu Jun 29 10:01:00 2017 (r3974)
@@ -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/branches/2.4/common/create-sbu_du-report.sh
==============================================================================
--- jhalfs/branches/2.4/common/create-sbu_du-report.sh Thu Jun 29 09:54:28
2017 (r3973)
+++ jhalfs/branches/2.4/common/create-sbu_du-report.sh Thu Jun 29 10:01:00
2017 (r3974)
@@ -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
Modified: jhalfs/branches/2.4/common/libs/func_book_parser
==============================================================================
--- jhalfs/branches/2.4/common/libs/func_book_parser Thu Jun 29 09:54:28
2017 (r3973)
+++ jhalfs/branches/2.4/common/libs/func_book_parser Thu Jun 29 10:01:00
2017 (r3974)
@@ -142,16 +142,16 @@
echo -n " ${L_arrow}${BOLD}$MODEL + $KERNEL${R_arrow} HLFS flavour... "
xsltproc --nonet \
--xinclude \
- --stringparam model $MODEL \
- --stringparam kernel $KERNEL \
- --stringparam testsuite $TEST \
- --stringparam bomb-testsuite $BOMB_TEST \
+ --stringparam model "$MODEL" \
+ --stringparam kernel "$KERNEL" \
+ --stringparam testsuite "$TEST" \
+ --stringparam bomb-testsuite "$BOMB_TEST" \
--stringparam features \
x$SSP$ASLR$PAX$HARDENED_TMP$WARNINGS$MISC$BLOWFISH \
- --stringparam timezone $TIMEZONE \
- --stringparam page $PAGE \
- --stringparam lang $LANG \
- --stringparam grsecurity_host $GRSECURITY_HOST \
+ --stringparam timezone "$TIMEZONE" \
+ --stringparam page "$PAGE" \
+ --stringparam lang "$LANG" \
+ --stringparam grsecurity_host "$GRSECURITY_HOST" \
--output ./${PROGNAME}-commands/ \
$XSL \
$BOOK/index.xml >>$LOGDIR/$LOG 2>&1
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
