From a131250b6fe833440503e8a63d66b44271d2b280 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Sun, 29 Mar 2020 13:17:38 +0000
Subject: [PATCH] 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
---
 LFS/lfs.xsl | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 06ff0a9..9b8dea1 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -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>