Changeset 575bcf3 for LFS/lfs.xsl


Ignore:
Timestamp:
02/12/2012 06:33:40 PM (13 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
e639536
Parents:
4fa38dd
Message:

Modifies package manager scriptlet generation so that it is possible to
install several packages instead of only one (needed for pacman)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • LFS/lfs.xsl

    r4fa38dd r575bcf3  
    8585    <xsl:if test="@id='ch-tools-stripping' and $pkgmngt='y'">
    8686      <xsl:apply-templates
    87               select="document('packageManager.xml')//sect1[@id='ch-tools-pkgmngt']"
     87              select="document('packageManager.xml')//sect1[contains(@id,'ch-tools')]"
    8888              mode="pkgmngt">
    89         <xsl:with-param name="order" select="concat($order,'-1')"/>
     89        <xsl:with-param name="order" select="$order"/>
    9090        <xsl:with-param name="dirname" select="$dirname"/>
    9191      </xsl:apply-templates>
    … …  
    9393    <xsl:if test="@id='ch-system-strippingagain' and $pkgmngt='y'">
    9494      <xsl:apply-templates
    95               select="document('packageManager.xml')//sect1[@id='ch-system-pkgmngt']"
     95              select="document('packageManager.xml')//sect1[contains(@id,'ch-system')]"
    9696              mode="pkgmngt">
    97         <xsl:with-param name="order" select="concat($order,'-1')"/>
     97        <xsl:with-param name="order" select="$order"/>
    9898        <xsl:with-param name="dirname" select="$dirname"/>
    9999      </xsl:apply-templates>
    … …  
    218218        <xsl:apply-templates
    219219           select="document('packageManager.xml')//sect1[
    220                                        @id='ch-system-pkgmngt-creatingdirs'
     220                                       @id='ch-pkgmngt-creatingdirs'
    221221                                                        ]//userinput"/>
    222222      </xsl:if>
    … …  
    224224        <xsl:apply-templates
    225225           select="document('packageManager.xml')//sect1[
    226                                        @id='ch-system-pkgmngt-createfiles'
     226                                       @id='ch-pkgmngt-createfiles'
    227227                                                        ]//userinput"/>
    228228      </xsl:if>
    … …  
    239239    <xsl:param name="dirname" select="chapter05"/>
    240240    <!-- The build order -->
    241     <xsl:param name="order" select="062-1"/>
     241    <xsl:param name="order" select="062"/>
    242242<!-- The file names -->
    243243    <xsl:variable name="pi-file" select="processing-instruction('dbhtml')"/>
    … …  
    245245    <xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
    246246     <!-- Creating dirs and files -->
    247     <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
     247    <exsl:document href="{$dirname}/{$order}-{position()}-{$filename}" method="text">
    248248      <xsl:text>#!/bin/bash
    249249set +h
    … …  
    255255           select=".//screen[not(@role) or @role != 'nodump']/userinput[@remap != 'adjust']"
    256256           mode="pkgmngt"/>
    257       <xsl:if test="@id = 'ch-system-pkgmngt'">
     257      <xsl:if test="$dirname = 'chapter06'">
    258258        <xsl:text>packInstall
    259259rm -rf $PKG_DEST
Note: See TracChangeset for help on using the changeset viewer.