LFS: remove alternate server code

It's been broken for years, and nobody has complained, so I'd say
it is not useful. If a user wants to use a mirror instead of upstream,
better use a wget-list directly on this server...

5 files changed, 1 insertions, 18 deletions

diff --git a/Config.in b/Config.in
index b4205346ad..d03ae88b3e 100644
--- a/Config.in
+++ b/Config.in
@@ -421,16 +421,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
diff --git a/common/libs/func_download_pkgs b/common/libs/func_download_pkgs
index 3d369d26f6..a6d9c7eb33 100644
--- a/common/libs/func_download_pkgs
+++ b/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      \
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs
index 8a87b1b77f..45c25a8bd8 100644
--- a/common/libs/func_install_blfs
+++ b/common/libs/func_install_blfs
@@ -179,7 +179,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
diff --git a/common/libs/func_validate_configs.sh b/common/libs/func_validate_configs.sh
index ec21656a6c..fa8e8fbbdf 100644
--- a/common/libs/func_validate_configs.sh
+++ b/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`" ;;
diff --git a/common/urls.xsl b/common/urls.xsl
index 3bfa072559..185f07d33b 100644
--- a/common/urls.xsl
+++ b/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'"/>