Changeset a6fbc65 for BLFS


Ignore:
Timestamp:
12/16/2021 09:26:43 AM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
ablfs-more, legacy, trunk
Children:
b8e5cad
Parents:
f9a7f8e
Message:

Allow to store version of -pass1 packages

With the new way of treating dependencies, we need to properly
manage -pass1 packages: For that we need the installed version of
-pass1 packages. But it is recorded nowhere. packages.xml shouldn't
be used for that, because it is directly built from the book
dependencies: adding -pass1 packages would just duplicate the
dependency information. So the version has to be recorded in
the tracking file. This involves changing bump.xsl (this commit),
and passing the tracking file to gen_pkg_book (next commit).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BLFS/xsl/bump.xsl

    rf9a7f8e ra6fbc65  
    88  <xsl:param name="version" select="'N'"/>
    99
     10  <xsl:variable name="realpackage">
     11    <xsl:choose>
     12      <xsl:when test="contains($package, '-pass1')">
     13        <xsl:copy-of select="substring-before($package, '-pass1')"/>
     14      </xsl:when>
     15      <xsl:otherwise>
     16        <xsl:copy-of select="$package"/>
     17      </xsl:otherwise>
     18    </xsl:choose>
     19  </xsl:variable>
     20
    1021  <xsl:variable name="vers">
    1122    <xsl:choose>
    … …  
    1324        <xsl:value-of select=
    1425            "document($packages)//*[self::package or self::module]
    15                                    [string(name)=$package]/version"/>
     26                                   [string(name)=$realpackage]/version"/>
    1627      </xsl:when>
    1728      <xsl:otherwise>
    18         <xsl:value-of select="$version"/>
     29        <xsl:copy-of select="$version"/>
    1930      </xsl:otherwise>
    2031    </xsl:choose>
    … …  
    3243      <xsl:if test="not(.//package[string(name)=$package])">
    3344        <package>
    34           <name><xsl:value-of select="$package"/></name>
    35           <version><xsl:value-of select="$vers"/></version>
     45          <name><xsl:copy-of select="$package"/></name>
     46          <version><xsl:copy-of select="$vers"/></version>
    3647        </package>
    3748      </xsl:if>
    … …  
    4354      <xsl:when test="string(name)=$package">
    4455        <package>
    45           <name><xsl:value-of select="name"/></name>
    46           <version><xsl:value-of select="$vers"/></version>
     56          <name><xsl:copy-of select="$package"/></name>
     57          <version><xsl:copy-of select="$vers"/></version>
    4758        </package>
    4859      </xsl:when>
Note: See TracChangeset for help on using the changeset viewer.