From: nynex <nynex>
Date: Wed, 22 Apr 2015 22:49:52 +0000 (+0000)
Subject: Removed "other" mirrors
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8178c5fba4e56763ca7dcb2c223dfd66c32f3ca7;p=librecmc%2Flibrecmc-fossil.git

Removed "other" mirrors
---

diff --git a/trunk/include/download.mk b/trunk/include/download.mk
index adaa2e6a..388dc72c 100644
--- a/trunk/include/download.mk
+++ b/trunk/include/download.mk
@@ -11,7 +11,7 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
 define dl_method
 $(strip \
   $(if $(2),$(2), \
-    $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \
+    $(if $(filter @GNOME/% @GNU/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \
       $(if $(filter git://%,$(1)),git, \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \
diff --git a/trunk/scripts/download.pl b/trunk/scripts/download.pl
index 9c8d2cbf..289402a9 100755
--- a/trunk/scripts/download.pl
+++ b/trunk/scripts/download.pl
@@ -165,17 +165,7 @@ foreach my $mirror (@ARGV) {
 		push @mirrors, "http://nongnu.uib.no/$1";
 		push @mirrors, "http://ftp.igh.cnrs.fr/pub/nongnu/$1";
 		push @mirrors, "http://download-mirror.savannah.gnu.org/releases/$1";
-	} elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
-		my @extra = ( $1 );
-		if ($filename =~ /linux-\d+\.\d+(?:\.\d+)?-rc/) {
-			push @extra, "$extra[0]/testing";
-		} elsif ($filename =~ /linux-(\d+\.\d+(?:\.\d+)?)/) {
-			push @extra, "$extra[0]/longterm/v$1";
-		}		
-		foreach my $dir (@extra) {
-			push @mirrors, "ftp://ftp.all.kernel.org/pub/$dir";
-			push @mirrors, "http://ftp.all.kernel.org/pub/$dir";
-		}
+	
     } elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
 		push @mirrors, "http://ftp.gnome.org/pub/GNOME/sources/$1";
 		push @mirrors, "http://ftp.unina.it/pub/linux/GNOME/sources/$1";
@@ -196,8 +186,9 @@ foreach my $mirror (@ARGV) {
 }
 
 #push @mirrors, 'http://mirror1.librecmc.org';
-push @mirrors, 'http://mirror2.openwrt.org/sources';
-push @mirrors, 'http://downloads.openwrt.org/sources';
+push @mirrors, 'http://downloads.librecmc.org/sources/v1.3.1';
+push @mirrors, 'http://hype.downloads.librecmc.org/sources';
+
 
 while (!$ok) {
 	my $mirror = shift @mirrors;