Changeset d68eb1b for LFS/lfs.xsl


Ignore:
Timestamp:
01/12/2014 09:40:20 PM (11 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
2.4, ablfs-more, legacy, new_features, trunk
Children:
b97ed5b
Parents:
7735c7a
Message:

Major change to th scripts layout:

  • Do not put the chroot commands in $PROGNAME-commands, but rather in a separate directory chroot-scripts
  • Use the commands in the chroot-scripts directory to generate the CHROOT variables in Makefile
  • The commands are extracted to $PROGNAME-commands only if they do not have role="nodump attribute and they do not begin with "chroot" (for compatibility with previous books where chroot commands did not have the role="nodump" attribute.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • LFS/lfs.xsl

    r7735c7a rd68eb1b  
    5555                  count(descendant::screen/userinput) &gt; 0 and
    5656                  count(descendant::screen/userinput) &gt;
    57                       count(descendant::screen[@role='nodump'])">
     57                      count(descendant::screen[@role='nodump']) and
     58                  count(descendant::screen/userinput) &gt;
     59                      count(descendant::screen/userinput[starts-with(string(),'chroot')])">
     60<!-- The last condition is a hack to allow previous versions of the
     61     book where the chroot commands did not have role="nodump".
     62     It only works if the chroot command is the only one on the page -->
    5863        <!-- The dirs names -->
    5964      <xsl:variable name="pi-dir" select="../processing-instruction('dbhtml')"/>
    … …  
    134139                                                        ]//userinput"/>
    135140      </xsl:if>
    136       <xsl:if test="not(@id='ch-system-chroot') and
    137                     not(@id='ch-system-revisedchroot')">
    138         <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
    139       </xsl:if>
     141      <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
    140142      <xsl:text>exit&#xA;</xsl:text>
    141143    </exsl:document>
    … …  
    144146
    145147  <xsl:template match="sect2">
    146     <!--XML::Parser is on the same page as Perl. The present code is OK
    147         except for PKG_DEST and PKGDIR, which would be the same as for Perl.
    148         so set them to valid values.
    149         Since rev 10281, that is no more true. So comment out.
    150     <xsl:if test="contains(string(./title),'XML::Parser')">
    151       <xsl:text>PKGDIR=$(dirname $PKGDIR)/</xsl:text>
    152       <xsl:copy-of select="substring-after(.//userinput[@remap='pre'], 'cd ')"/>
    153       <xsl:text>
    154 PKG_DEST=$(dirname $PKGDIR)/000-xml-parser
    155 </xsl:text>
    156     </xsl:if>-->
    157148    <xsl:apply-templates
    158149      select=".//screen[not(@role) or
Note: See TracChangeset for help on using the changeset viewer.