From: nynex <nynex>
Date: Tue, 28 Jul 2015 18:30:03 +0000 (+0000)
Subject: Changed kernel download source to pull from linux-libre kernel servers or libreCMC... 
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6f1781cefea33523fbbb3ab95eb86f8db31e75c2;p=librecmc%2Flibrecmc-fossil.git

Changed kernel download source to pull from linux-libre kernel servers or libreCMC servers.
---

diff --git a/trunk/include/kernel.mk b/trunk/include/kernel.mk
index 69cbe962..eb4f35eb 100644
--- a/trunk/include/kernel.mk
+++ b/trunk/include/kernel.mk
@@ -52,7 +52,7 @@ else
   LINUX_SOURCE:=linux-libre-$(LINUX_VERSION)-gnu.tar.xz
   TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
   ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),)
-      LINUX_SITE:=@KERNEL/linux/kernel/v$(word 1,$(subst ., ,$(KERNEL_BASE))).x$(TESTING)
+      LINUX_SITE:=@KERNEL/$(LINUX_VERSION)-gnu$(TESTING)
   endif
 
   ifneq ($(TARGET_BUILD),1)
diff --git a/trunk/scripts/download.pl b/trunk/scripts/download.pl
index 9c8d2cbf..62e57977 100755
--- a/trunk/scripts/download.pl
+++ b/trunk/scripts/download.pl
@@ -167,14 +167,13 @@ foreach my $mirror (@ARGV) {
 		push @mirrors, "http://download-mirror.savannah.gnu.org/releases/$1";
 	} elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
 		my @extra = ( $1 );
-		if ($filename =~ /linux-\d+\.\d+(?:\.\d+)?-rc/) {
+		if ($filename =~ /linux-libre-\d+\.\d+(?:\.\d+)?-rc/) {
 			push @extra, "$extra[0]/testing";
-		} elsif ($filename =~ /linux-(\d+\.\d+(?:\.\d+)?)/) {
+		} elsif ($filename =~ /linux-libre-(\d+\.\d+(?:\.\d+)?)-gnu/) {
 			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";
+			push @mirrors, "http://linux-libre.fsfla.org/pub/linux-libre/releases/$dir";
 		}
     } elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
 		push @mirrors, "http://ftp.gnome.org/pub/GNOME/sources/$1";