Changeset a9ca77f

Timestamp:

02/13/2007 07:21:34 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

9bbf240

Parents:

53e258f

Message:

Fixed FTP mirror path for CLFSx books.

Location:

common

Files:

• libs/func_download_pkgs (modified) (5 diffs)
• urls.xsl (modified) (3 diffs)

common/libs/func_download_pkgs

@@ -137 +137 @@
         xsltproc --nonet --xinclude \
                  --stringparam server $SERVER \
+                 --stringparam family clfs \
                  -o $BUILDDIR/sources/urls.lst urls.xsl \
                  $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
@@ -145 +146 @@
         xsltproc --nonet --xinclude \
                  --stringparam server $SERVER \
+                 --stringparam family clfs \
                  -o $BUILDDIR/sources/urls.lst urls.xsl \
                  $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
@@ -153 +155 @@
         xsltproc --nonet --xinclude \
                  --stringparam server $SERVER \
+                 --stringparam family clfs \
                  -o $BUILDDIR/sources/urls.lst urls.xsl \
                  $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
@@ -161 +164 @@
         xsltproc --nonet --xinclude \
                  --stringparam server $SERVER \
+                 --stringparam family lfs \
                  --stringparam model $MODEL \
                  -o $BUILDDIR/sources/urls.lst urls.xsl \
@@ -170 +174 @@
         xsltproc --nonet --xinclude \
                  --stringparam server $SERVER \
+                 --stringparam family lfs \
                  -o ../sources/urls.lst urls.xsl \
                  $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1

common/urls.xsl

@@ -10 +10 @@
   <!-- The FTP server used as fallback -->
   <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 -->
@@ -55 +58 @@
       <!-- 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 +83 @@
           <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>