Changeset 88e5cbc


Ignore:
Timestamp:
05/07/2022 09:24:06 AM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
ablfs-more, trunk
Children:
dc53def
Parents:
924a237
Message:

Use only upstream's URL in urls.lst

Location:
common
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • common/libs/func_custom_pkgs

    r924a237 r88e5cbc  
    7373add_CustomToolsURLS() {            # Add any users supplied scripts URL information
    7474#----------------------------------#
    75   local BLFS_SERVER="${SERVER}/pub/blfs/conglomeration/"
    7675  local this_script
    7776  local URL PKG PKG_VERSION PKG_FILE MD5
    … …  
    8786    [[ "x${PKG}" = "x" ]] && continue
    8887
    89     echo "${URL} ${BLFS_SERVER}${PKG}/${PKG_FILE} ${MD5}" >> urls.lst.tmp
     88    echo "${URL} ${MD5}" >> urls.lst.tmp
    9089     # Add any patches..
    9190    for PATCH in PATCH{1..10}; do
    92       [[ -n ${!PATCH} ]] && echo "dummy-url ${!PATCH} CUSTOM-PATCH-MD5SUM" >> urls.lst.tmp
     91      [[ -n ${!PATCH} ]] && echo "${!PATCH} CUSTOM-PATCH-MD5SUM" >> urls.lst.tmp
    9392    done
    9493  done

  • common/urls.xsl

    r924a237 r88e5cbc  
    88  <!-- The FTP server used as fallback -->
    99  <xsl:param name="server">ftp://ftp.osuosl.org</xsl:param>
    10 
    11   <!-- The book family (lfs only now). Needed to use the proper FTP path. -->
    12   <!-- TODO not needed, remove -->
    13   <xsl:param name="family">lfs</xsl:param>
    1410
    1511  <!-- Do we use a package manager? -->
    … …  
    4238        </xsl:call-template>
    4339      </xsl:variable>
    44       <!-- Extract the directory for that package -->
    45       <xsl:variable name="cut"
    46                     select="translate(substring-after($package, '-'),
    47                     '0123456789', '0000000000')"/>
    48       <xsl:variable name="package2">
    49         <xsl:value-of select="substring-before($package, '-')"/>
    50         <xsl:text>-</xsl:text>
    51         <xsl:value-of select="$cut"/>
    52       </xsl:variable>
    53       <xsl:variable name="dirname" select="substring-before($package2, '-0')"/>
    5440      <!-- Write the upstream URLs, fixing the redirected ones -->
    5541      <xsl:choose>
    … …  
    6147        </xsl:otherwise>
    6248      </xsl:choose>
    63       <xsl:text> </xsl:text>
    64       <!-- Write FTP mirror URLs -->
    65       <xsl:value-of select="$server"/>
    66       <xsl:text>/pub/</xsl:text>
    67       <xsl:value-of select="$family"/>
    68       <xsl:text>/conglomeration/</xsl:text>
    69       <xsl:choose>
    70         <!-- Fix some directories. Test against $dirname to be sure that we
    71         are matching the start of a package name, not a string in a patch name
    72         But some packages requires test against $package. -->
    73         <xsl:when test="contains($dirname, 'bash')">
    74           <xsl:text>bash/</xsl:text>
    75         </xsl:when>
    76         <xsl:when test="contains($package, 'dvhtool')">
    77           <xsl:text>dvhtool/</xsl:text>
    78         </xsl:when>
    79         <xsl:when test="contains($dirname, 'gcc')">
    80           <xsl:text>gcc/</xsl:text>
    81         </xsl:when>
    82         <xsl:when test="contains($dirname, 'glibc')">
    83           <xsl:text>glibc/</xsl:text>
    84         </xsl:when>
    85         <xsl:when test="contains($package, 'powerpc-utils')">
    86           <xsl:text>powerpc-utils/</xsl:text>
    87         </xsl:when>
    88         <xsl:when test="contains($package, 'tcl')">
    89           <xsl:text>tcl/</xsl:text>
    90         </xsl:when>
    91         <xsl:when test="contains($package, 'uClibc')">
    92           <xsl:text>uClibc/</xsl:text>
    93         </xsl:when>
    94         <xsl:when test="contains($dirname, 'udev')">
    95           <xsl:text>udev/</xsl:text>
    96         </xsl:when>
    97         <xsl:when test="contains($dirname, 'iputils')">
    98           <xsl:text>iputils/</xsl:text>
    99         </xsl:when>
    100         <xsl:otherwise>
    101           <xsl:value-of select="$dirname"/>
    102           <xsl:text>/</xsl:text>
    103         </xsl:otherwise>
    104       </xsl:choose>
    105       <xsl:value-of select="$package"/>
    10649      <!-- Write MD5SUM value -->
    10750      <xsl:text> </xsl:text>
Note: See TracChangeset for help on using the changeset viewer.