Ignore:
Timestamp:
02/27/2017 02:09:03 PM (7 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
2.4, ablfs-more, legacy, trunk
Children:
67723e1
Parents:
9575278
Message:

Merge new_feature branch r3884 to3886:

  • Adapt BLFS/envars.conf to modern BLFS books
  • Fix try order for downloading BLFS packages
  • Fixes to use the XORG Legacy page in BLFS
File:
1 edited

Legend:

Unmodified
Added
Removed

  • BLFS/xsl/scripts.xsl

    r9575278 r342c862  
    216216    <xsl:value-of select="$varname"/>
    217217    <xsl:text>&#xA;  else&#xA;</xsl:text>
    218     <!-- The FTP_SERVER mirror -->
     218    <!-- Download from upstream http -->
     219    <xsl:if test="string-length($httpurl) &gt; 10">
     220      <xsl:text>    wget -T 30 -t 5 </xsl:text>
     221      <xsl:value-of select="$httpurl"/>
     222      <xsl:text> ||&#xA;</xsl:text>
     223    </xsl:if>
     224    <!-- Download from upstream ftp -->
     225    <xsl:if test="string-length($ftpurl) &gt; 10">
     226      <xsl:text>    wget -T 30 -t 5 </xsl:text>
     227      <xsl:value-of select="$ftpurl"/>
     228      <xsl:text> ||&#xA;</xsl:text>
     229    </xsl:if>
     230    <!-- The FTP_SERVER mirror as a last resort -->
    219231    <xsl:text>    wget -T 30 -t 5 ${FTP_SERVER}svn/</xsl:text>
    220232    <xsl:value-of select="$first_letter"/>
    221233    <xsl:text>/$</xsl:text>
    222234    <xsl:value-of select="$varname"/>
    223     <xsl:if test="string-length($httpurl) &gt; 10">
    224       <xsl:text> ||
    225     wget -T 30 -t 5 </xsl:text>
    226       <xsl:value-of select="$httpurl"/>
    227     </xsl:if>
    228     <xsl:if test="string-length($ftpurl) &gt; 10">
    229       <xsl:text> ||
    230     wget -T 30 -t 5 </xsl:text>
    231       <xsl:value-of select="$ftpurl"/>
    232     </xsl:if>
    233235    <xsl:text>
    234236    cp $</xsl:text>
Note: See TracChangeset for help on using the changeset viewer.