add a '@KERNEL' download facility, tweak script

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8495 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/kernel.mk b/include/kernel.mk
index b148ae9..b3eec97 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -42,10 +42,7 @@ else
 
   LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
   TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
-  LINUX_SITE:=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL)$(TESTING) \
-           http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL)$(TESTING) \
-           http://www.kernel.org/pub/linux/kernel/v$(KERNEL)$(TESTING) \
-           http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL)$(TESTING)
+  LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) \
 
   PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 endif

diff --git a/package/udev/Makefile b/package/udev/Makefile
index 4e00d6b..9f01587 100644 (file)
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -13,12 +13,7 @@ PKG_VERSION:=106
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
-       http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
-       ftp://ftp.de.kernel.org/pub/linux/utils/kernel/hotplug/ \
-       http://ftp.de.kernel.org/pub/linux/utils/kernel/hotplug/ \
-       ftp://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/ \
-       http://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/
+PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/hotplug/
 PKG_MD5SUM:=320ccd2d0f4540d10e021bafa14f8985
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 6c5a697..810a093 100644 (file)
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -13,10 +13,7 @@ PKG_VERSION:=2.12r
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
-       http://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
-       ftp://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
-       http://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/
+PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/
 PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/scripts/download.pl b/scripts/download.pl
index 543dcc1..66eaca8 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -112,15 +112,23 @@ foreach my $mirror (@ARGV) {
                        push @mirrors, "http://downloads.sourceforge.net/$1";
                }
        } elsif ($mirror =~ /^\@GNU\/(.+)$/) {
-               my $gnupath = $1;
-               push @mirrors, "ftp://ftp.gnu.org/gnu/$gnupath";
-               push @mirrors, "ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/$gnupath";
-               push @mirrors, "ftp://ftp.mirror.nl/pub/mirror/gnu/$gnupath";
-               push @mirrors, "http://mirror.switch.ch/ftp/mirror/gnu/$gnupath";
-               push @mirrors, "ftp://ftp.uu.net/archive/systems/gnu/$gnupath";
-               push @mirrors, "ftp://ftp.eu.uu.net/pub/gnu/$gnupath";
-               push @mirrors, "ftp://ftp.leo.org/pub/comp/os/unix/gnu/$gnupath";
-               push @mirrors, "ftp://ftp.digex.net/pub/gnu/$gnupath";
+               push @mirrors, "ftp://ftp.gnu.org/gnu/$1";
+               push @mirrors, "ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/$1";
+               push @mirrors, "ftp://ftp.mirror.nl/pub/mirror/gnu/$1";
+               push @mirrors, "http://mirror.switch.ch/ftp/mirror/gnu/$1";
+               push @mirrors, "ftp://ftp.uu.net/archive/systems/gnu/$1";
+               push @mirrors, "ftp://ftp.eu.uu.net/pub/gnu/$1";
+               push @mirrors, "ftp://ftp.leo.org/pub/comp/os/unix/gnu/$1";
+               push @mirrors, "ftp://ftp.digex.net/pub/gnu/$1";
+       } elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
+               push @mirrors, "ftp://ftp.us.kernel.org/pub/$1";
+               push @mirrors, "http://ftp.us.kernel.org/pub/$1";
+               push @mirrors, "ftp://ftp.kernel.org/pub/$1";
+               push @mirrors, "http://ftp.kernel.org/pub/$1";
+               push @mirrors, "ftp://ftp.de.kernel.org/pub/$1";
+               push @mirrors, "http://ftp.de.kernel.org/pub/$1";
+               push @mirrors, "ftp://ftp.fr.kernel.org/pub/$1";
+               push @mirrors, "http://ftp.fr.kernel.org/pub/$1";
        } else {
                push @mirrors, $mirror;
        }