Changeset 6a7c218

Timestamp:

06/29/2017 05:01:00 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4

Children:

f7d1386

Parents:

e218205

Message:

merge trunk r3972-3973

Files:

• BLFS/gen_pkg_book.sh (modified) (1 diff)
• CLFS/master.sh (modified) (1 diff)
• CLFS2/master.sh (modified) (1 diff)
• CLFS3/master.sh (modified) (1 diff)
• HLFS/master.sh (modified) (1 diff)
• LFS/master.sh (modified) (1 diff)
• common/create-sbu_du-report.sh (modified) (4 diffs)
• common/libs/func_book_parser (modified) (1 diff)

BLFS/gen_pkg_book.sh

@@ -179 +179 @@
 rm -rf scripts
 xsltproc --xinclude --nonet \
-         --stringparam sudo $SUDO \
+         --stringparam sudo "$SUDO" \
          -o ./scripts/ ${MakeScripts} \
          ${BookXml}

CLFS/master.sh

@@ -1122 +1122 @@
         @\$(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;

CLFS2/master.sh

@@ -503 +503 @@
         @\$(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;

CLFS3/master.sh

@@ -552 +552 @@
         @\$(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;

HLFS/master.sh

@@ -617 +617 @@
         @\$(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;

LFS/master.sh

@@ -575 +575 @@
         @\$(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;

common/create-sbu_du-report.sh

@@ -6 +6 @@
 LOGSDIR=$1
 VERSION=$2
+DATE=$3
 
 LINE="================================================================================"
@@ -11 +12 @@
 # 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
@@ -19 +20 @@
 # 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
@@ -26 +28 @@
 
 # Set the report file
-REPORT="$VERSION"-SBU_DU-$(date --iso-8601).report
+REPORT="$VERSION"-SBU_DU-"$DATE".report
 
 [ -f $REPORT ] && : >$REPORT

common/libs/func_book_parser

@@ -143 +143 @@
         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                                                   \