Merge branch 'trunk' into xry111/parallelism

BLFS/xsl/scripts.xsl

@@ -441,10 +441,6 @@ echo Start Time: ${SECONDS} >> $INFOLOG
         </xsl:with-param>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="first_letter"
-                  select="translate(substring($package,1,1),
-                                    'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-                                    'abcdefghijklmnopqrstuvwxyz')"/>
     <xsl:text>&#xA;</xsl:text>
     <xsl:value-of select="$varname"/>
     <xsl:text>=</xsl:text>
@@ -460,24 +456,9 @@ echo Start Time: ${SECONDS} >> $INFOLOG
     <xsl:text>" "$</xsl:text>
     <xsl:value-of select="$varname"/>
     <xsl:text>"
-  else&#xA;</xsl:text>
-    <!-- Download from upstream http -->
-    <xsl:if test="string-length($httpurl) &gt; 10">
-      <xsl:text>    wget -T 30 -t 5 "</xsl:text>
-      <xsl:value-of select="$httpurl"/>
-      <xsl:text>" ||&#xA;</xsl:text>
-    </xsl:if>
-    <!-- Download from upstream ftp -->
-    <xsl:if test="string-length($ftpurl) &gt; 10">
-      <xsl:text>    wget -T 30 -t 5 "</xsl:text>
-      <xsl:value-of select="$ftpurl"/>
-      <xsl:text>" ||&#xA;</xsl:text>
-    </xsl:if>
-    <!-- The FTP_SERVER mirror as a last resort -->
-    <xsl:text>    wget -T 30 -t 5 "${JH_FTP_SERVER}svn/</xsl:text>
-    <xsl:value-of select="$first_letter"/>
-    <xsl:text>/$</xsl:text>
-    <xsl:value-of select="$varname"/>
+  else<!-- Download from upstream http -->
+    wget -T 30 -t 5 "</xsl:text>
+    <xsl:value-of select="$httpurl"/>
     <xsl:text>"
   fi
 fi</xsl:text>

Config.in

@@ -429,16 +429,6 @@ depends on !BOOK_BLFS
             #-- Number of seconds to wait for a download to start before
             #   timing out.
 
-    config SERVER
-        string "FTP mirror"
-        default "http://ftp.osuosl.org"
-        depends on GETPKG
-        help
-            #-- FTP mirror to download packages and patches if not found
-            #   in $SRC_ARCHIVE
-            #   As a last resort, the files will downloaded from upstream,
-            #   if possible.
-
     config    RUNMAKE
         bool    "Run the makefile"
         default n

common/libs/func_download_pkgs

@@ -132,8 +132,6 @@ create_urls() {              #
 
   echo -n "Creating URLs file... "
   xsltproc --nonet --xinclude                \
-           --stringparam server "$SERVER"    \
-           --stringparam family lfs          \
            --stringparam pkgmngt "$PKGMNGT"  \
            --stringparam revision "$INITSYS" \
            --output ../sources/urls.lst      \

common/libs/func_install_blfs

@@ -180,7 +180,6 @@ pushd $BUILDDIR/sources
 # Remove `unpacked' files if some have been left
 sudo find . -name unpacked -exec rm \{\} \;
 if [ "$GETPKG" = "y" ]; then
-    JH_FTP_SERVER=$SERVER/pub/blfs/ \
     JH_SRC_ARCHIVE=${SRC_ARCHIVE:-/dev/null}     \
     $BUILDDIR$BLFS_ROOT/download_script
 else # Save the download script in case the user wants to run it later

common/libs/func_validate_configs.sh

@@ -18,7 +18,7 @@ inline_doc
   # Common settings by Config.in sections and books family
   local -r     BOOK_common="COMMIT BOOK CUSTOM_TOOLS"
   local -r  GENERAL_common="LUSER LGROUP LHOME BUILDDIR CLEAN GETPKG SRC_ARCHIVE \
-                            SERVER RETRYSRCDOWNLOAD RETRYDOWNLOADCNT DOWNLOADTIMEOUT \
+                            RETRYSRCDOWNLOAD RETRYDOWNLOADCNT DOWNLOADTIMEOUT \
                             RUNMAKE"
   local -r    BUILD_chroot="TEST STRIP"
   local -r    BUILD_common="FSTAB CONFIG TIMEZONE PAGE LANG INSTALL_LOG"
@@ -129,7 +129,6 @@ inline_doc
       ITERATIONS)       [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       TARGET32)         [[ -n "${TARGET32}" ]] &&  echo -e "`eval echo $PARAM_VALS`" ;;
       MIPS_LEVEL)       [[ "${ARCH}" = "mips" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      SERVER)           [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       RETRYSRCDOWNLOAD) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       RETRYDOWNLOADCNT) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       DOWNLOADTIMEOUT)  [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;

common/urls.xsl

@@ -5,9 +5,6 @@
 
   <xsl:output method="text"/>
 
-  <!-- The FTP server used as fallback -->
-  <xsl:param name="server">ftp://ftp.osuosl.org</xsl:param>
-
   <!-- Do we use a package manager? -->
   <xsl:param name="pkgmngt" select="'n'"/>