zeroday0619/MahiroOS-jhalfs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed FTP mirror path for CLFSx books.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2007-02-13 19:21:34 +00:00
parent 53e258f2fe
commit a9ca77ff02
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/libs/func_download_pkgs
View file

@ -136,6 +136,7 @@ create_urls() { #
echo -n "Creating CLFS <${ARCH}> specific URLs file" echo -n "Creating CLFS <${ARCH}> specific URLs file"
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam server $SERVER \ --stringparam server $SERVER \
--stringparam family clfs \
-o $BUILDDIR/sources/urls.lst urls.xsl \ -o $BUILDDIR/sources/urls.lst urls.xsl \
$BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1 $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK" echo " ...OK"
@ -144,6 +145,7 @@ create_urls() { #
echo -n "Creating CLFS2 <${ARCH}> specific URLs file" echo -n "Creating CLFS2 <${ARCH}> specific URLs file"
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam server $SERVER \ --stringparam server $SERVER \
--stringparam family clfs \
-o $BUILDDIR/sources/urls.lst urls.xsl \ -o $BUILDDIR/sources/urls.lst urls.xsl \
$BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1 $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK" echo " ...OK"
@ -152,6 +154,7 @@ create_urls() { #
echo -n "Creating CLFS3 <${ARCH}> specific URLs file" echo -n "Creating CLFS3 <${ARCH}> specific URLs file"
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam server $SERVER \ --stringparam server $SERVER \
--stringparam family clfs \
-o $BUILDDIR/sources/urls.lst urls.xsl \ -o $BUILDDIR/sources/urls.lst urls.xsl \
$BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1 $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK" echo " ...OK"
@ -160,6 +163,7 @@ create_urls() { #
echo -n "Creating HLFS <${MODEL}> specific URLs file" echo -n "Creating HLFS <${MODEL}> specific URLs file"
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam server $SERVER \ --stringparam server $SERVER \
--stringparam family lfs \
--stringparam model $MODEL \ --stringparam model $MODEL \
-o $BUILDDIR/sources/urls.lst urls.xsl \ -o $BUILDDIR/sources/urls.lst urls.xsl \
$BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1 $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
@ -169,6 +173,7 @@ create_urls() { #
echo -n "Creating LFS specific URLs file" echo -n "Creating LFS specific URLs file"
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam server $SERVER \ --stringparam server $SERVER \
--stringparam family lfs \
-o ../sources/urls.lst urls.xsl \ -o ../sources/urls.lst urls.xsl \
$BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1 $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK" echo " ...OK"

9
common/urls.xsl
View file

@ -10,6 +10,9 @@
<!-- The FTP server used as fallback --> <!-- The FTP server used as fallback -->
<xsl:param name="server">ftp://ftp.osuosl.org</xsl:param> <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 --> <!-- The libc model used for HLFS -->
<xsl:param name="model" select="glibc"/> <xsl:param name="model" select="glibc"/>
@ -54,7 +57,9 @@
<xsl:text> </xsl:text> <xsl:text> </xsl:text>
<!-- Write FTP mirror URLs --> <!-- Write FTP mirror URLs -->
<xsl:value-of select="$server"/> <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> <xsl:choose>
<!-- Fix some directories. Test against $dirname to be sure that we <!-- Fix some directories. Test against $dirname to be sure that we
are matching the start of a package name, not a string in a patch name are matching the start of a package name, not a string in a patch name
@ -77,7 +82,7 @@
<xsl:when test="contains($package, 'tcl')"> <xsl:when test="contains($package, 'tcl')">
<xsl:text>tcl/</xsl:text> <xsl:text>tcl/</xsl:text>
</xsl:when> </xsl:when>
<xsl:when test="contains($dirname, 'uClibc')"> <xsl:when test="contains($package, 'uClibc')">
<xsl:text>uClibc/</xsl:text> <xsl:text>uClibc/</xsl:text>
</xsl:when> </xsl:when>
<xsl:when test="contains($dirname, 'udev')"> <xsl:when test="contains($dirname, 'udev')">