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
This commit is contained in:
Pierre Labastie 2020-03-29 13:17:38 +00:00
parent 5e4a124e3d
commit a131250b6f

View file

@ -100,11 +100,12 @@
of the "calling" apply-template. But that would change the numbering, of the "calling" apply-template. But that would change the numbering,
so that it would be difficult to compare to previous versions. So for so that it would be difficult to compare to previous versions. So for
version 2.4, let us keep this --> version 2.4, let us keep this -->
<xsl:if test="(../@id='chapter-temporary-tools' or <xsl:if test="(../@id='chapter-temporary-tools' or
../@id='chapter-building-system' or ../@id='chapter-final-preps' or
../@id='chapter-bootscripts' or ../@id='chapter-building-system' or
../@id='chapter-config' or ../@id='chapter-bootscripts' or
../@id='chapter-bootable') and ../@id='chapter-config' or
../@id='chapter-bootable') and
(sect2[not(@revision) or @revision=$revision]//..|.)/ (sect2[not(@revision) or @revision=$revision]//..|.)/
screen[(not(@role) or @role != 'nodump') and screen[(not(@role) or @role != 'nodump') and
(not(@revision) or @revision=$revision)]/ (not(@revision) or @revision=$revision)]/
@ -172,9 +173,11 @@
<xsl:text>set -e&#xA;</xsl:text> <xsl:text>set -e&#xA;</xsl:text>
</xsl:if> </xsl:if>
<xsl:text>&#xA;</xsl:text> <xsl:text>&#xA;</xsl:text>
<xsl:call-template name="start-script"> <xsl:if test="ancestor::chapter/@id != 'chapter-final-preps'">
<xsl:with-param name="order" select="$order"/> <xsl:call-template name="start-script">
</xsl:call-template> <xsl:with-param name="order" select="$order"/>
</xsl:call-template>
</xsl:if>
<xsl:apply-templates select="sect2[not(@revision) or <xsl:apply-templates select="sect2[not(@revision) or
@revision=$revision] | @revision=$revision] |
screen[(not(@role) or screen[(not(@role) or
@ -195,8 +198,10 @@
]//userinput" ]//userinput"
mode="pkgmngt"/> mode="pkgmngt"/>
</xsl:if> </xsl:if>
<xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text> <xsl:if test="ancestor::chapter/@id != 'chapter-final-preps'">
<xsl:call-template name="end-script"/> <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> <xsl:text>exit&#xA;</xsl:text>
</exsl:document> </exsl:document>
</xsl:if> </xsl:if>