Changeset 9c9775f for common/urls.xsl

Timestamp:

09/19/2007 04:50:48 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

3778352

Parents:

0510381

Message:

Updated experimental branch to current trunk code.

File:

• common/urls.xsl (modified) (5 diffs)

common/urls.xsl

@@ -11 +11 @@
   <xsl:param name="server">ftp://ftp.osuosl.org</xsl:param>
 
+  <!-- The book family (lfs or clfs). Needed to use the proper FTP path. -->
+  <xsl:param name="family">lfs</xsl:param>
+
   <!-- The libc model used for HLFS -->
   <xsl:param name="model" select="glibc"/>
+
+  <!-- The kernel series used for HLFS -->
+  <xsl:param name="kernel" select="2.6"/>
 
   <xsl:template match="/">
@@ -24 +30 @@
     <xsl:if test="(ancestor::varlistentry[@condition=$model]
                   or not(ancestor::varlistentry[@condition])) and
-                  (contains(@url, '.tar.') or contains(@url, '.tgz')
-                  or contains(@url, '.patch')) and
+                  (ancestor::varlistentry[@vendor=$kernel]
+                  or not(ancestor::varlistentry[@vendor])) and
+                  (contains(@url, '.bz2') or contains(@url, '.tar.gz') or
+                  contains(@url, '.tgz') or contains(@url, '.patch')) and
                   not(ancestor-or-self::*/@condition = 'pdf')">
       <!-- Extract the package name -->
@@ -43 +51 @@
       </xsl:variable>
       <xsl:variable name="dirname" select="substring-before($package2, '-0')"/>
-      <!-- Write the upstream URLs, except the redirected ones -->
+      <!-- Write the upstream URLs, fixing the redirected ones -->
       <xsl:choose>
         <xsl:when test="contains(@url,'?')">
-          <xsl:text>dummy-url</xsl:text>
+          <xsl:value-of select="substring-before(@url,'?')"/>
         </xsl:when>
         <xsl:otherwise>
@@ -55 +63 @@
       <!-- Write FTP mirror URLs -->
       <xsl:value-of select="$server"/>
-      <xsl:text>/pub/lfs/conglomeration/</xsl:text>
+      <xsl:text>/pub/</xsl:text>
+      <xsl:value-of select="$family"/>
+      <xsl:text>/conglomeration/</xsl:text>
       <xsl:choose>
         <!-- Fix some directories. Test against $dirname to be sure that we
@@ -78 +88 @@
           <xsl:text>tcl/</xsl:text>
         </xsl:when>
-        <xsl:when test="contains($dirname, 'uClibc')">
+        <xsl:when test="contains($package, 'uClibc')">
           <xsl:text>uClibc/</xsl:text>
         </xsl:when>