[alfs-log] r4138 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Mar 29 06:17:38 2020
New Revision: 4138

Log:
Generate chapter 4 scriptlets

This is a major change for LFS. We won't be using the makefile for
the final preparations, but we'll extract the book instructions and
use them (the "use part not in this commit).
Since getting figures for those scriptlets is not important, and we
cannot use start and end scripts, which need already set up user and
dirs, do not use them

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==============================================================================
--- jhalfs/trunk/LFS/lfs.xsl    Sun Mar 29 06:05:48 2020        (r4137)
+++ jhalfs/trunk/LFS/lfs.xsl    Sun Mar 29 06:17:38 2020        (r4138)
@@ -100,11 +100,12 @@
      of the "calling" apply-template. But that would change the numbering,
      so that it would be difficult to compare to previous versions. So for
      version 2.4, let us keep this -->
-        <xsl:if test="(../@id='chapter-temporary-tools' or
-                  ../@id='chapter-building-system' or
-                  ../@id='chapter-bootscripts' or
-                  ../@id='chapter-config' or
-                  ../@id='chapter-bootable') and
+    <xsl:if test="(../@id='chapter-temporary-tools' or
+                   ../@id='chapter-final-preps' or
+                   ../@id='chapter-building-system' or
+                   ../@id='chapter-bootscripts' or
+                   ../@id='chapter-config' or
+                   ../@id='chapter-bootable') and
                   (sect2[not(@revision) or @revision=$revision]//..|.)/
                       screen[(not(@role) or @role != 'nodump') and
                              (not(@revision) or @revision=$revision)]/
@@ -172,9 +173,11 @@
         <xsl:text>set -e&#xA;</xsl:text>
       </xsl:if>
       <xsl:text>&#xA;</xsl:text>
-      <xsl:call-template name="start-script">
-        <xsl:with-param name="order" select="$order"/>
-      </xsl:call-template>
+      <xsl:if test="ancestor::chapter/@id != 'chapter-final-preps'">
+        <xsl:call-template name="start-script">
+          <xsl:with-param name="order" select="$order"/>
+        </xsl:call-template>
+      </xsl:if>
       <xsl:apply-templates select="sect2[not(@revision) or
                                          @revision=$revision] |
                                    screen[(not(@role) or
@@ -195,8 +198,10 @@
                                                         ]//userinput"
            mode="pkgmngt"/>
       </xsl:if>
-      <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
-      <xsl:call-template name="end-script"/>
+      <xsl:if test="ancestor::chapter/@id != 'chapter-final-preps'">
+        <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
+        <xsl:call-template name="end-script"/>
+      </xsl:if>
       <xsl:text>exit&#xA;</xsl:text>
     </exsl:document>
     </xsl:if>
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page