Add support for GNU and kernel.org mirrors

diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index 3350121d75452dda8e9b41a7a1accfc343c7e74b..00ce8567eaa3bafc707d557a6baf94e81c01d36b 100644 (file)
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -5,7 +5,7 @@
 #############################################################
 ED_VERSION:=0.8
 ED_SOURCE:=ed-$(ED_VERSION).tar.bz2
-ED_SITE:=http://ftp.gnu.org/gnu/ed/
+ED_SITE:=$(BR2_GNU_MIRROR)/ed/
 ED_CAT:=$(BZCAT)
 ED_DIR:=$(BUILD_DIR)/ed-$(ED_VERSION)
 ED_BINARY:=ed

diff --git a/package/hotplug/hotplug.mk b/package/hotplug/hotplug.mk
index d9a624499f3be3243da666bb8813939c58b702d0..2b5659cdebd0dc131b4a2c1c1873163d8e69cb1c 100644 (file)
--- a/package/hotplug/hotplug.mk
+++ b/package/hotplug/hotplug.mk
@@ -5,7 +5,7 @@
 #############################################################
 HOTPLUG_VERSION:=0.5
 HOTPLUG_SOURCE=package/hotplug/diethotplug-$(HOTPLUG_VERSION).tar
-HOTPLUG_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/
+HOTPLUG_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-$(HOTPLUG_VERSION)
 HOTPLUG_CAT=cat
 

diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index bcebd037588b0f97c9b9543d97b207bf9a82dc9f..99b3042778aaf8b78466cc1ee84594c63811bf83 100644 (file)
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -5,7 +5,7 @@
 #############################################################
 GNUTAR_VERSION:=1.18
 GNUTAR_SOURCE:=tar-$(GNUTAR_VERSION).tar.bz2
-GNUTAR_SITE:=http://ftp.gnu.org/gnu/tar/
+GNUTAR_SITE:=$(BR2_GNU_MIRROR)/tar/
 GNUTAR_DIR:=$(BUILD_DIR)/tar-$(GNUTAR_VERSION)
 GNUTAR_CAT:=$(BZCAT)
 GNUTAR_BINARY:=src/tar

diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 52f7a7c21dc9e5ef8289f9948148a280fa697f01..97d0650b8dd8e6c5ba2cf109e2c693f3c55728ee 100644 (file)
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -5,7 +5,7 @@
 #############################################################
 TFTP_HPA_VERSION:=0.40
 TFTP_HPA_SOURCE:=tftp-hpa-$(TFTP_HPA_VERSION).tar.bz2
-TFTP_HPA_SITE:=http://www.kernel.org/pub/software/network/tftp/
+TFTP_HPA_SITE:=$(BR2_KERNEL_MIRROR)/software/network/tftp/
 TFTP_HPA_DIR:=$(BUILD_DIR)/tftp-hpa-$(TFTP_HPA_VERSION)
 TFTP_HPA_CAT:=$(BZCAT)
 TFTP_HPA_BINARY:=tftpd/tftpd

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index caacf55e2206b31ec626aa52ab19428ed010ef10..9466a850b8ecc02ada21ad756799a49f571bfea0 100644 (file)
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -5,7 +5,7 @@
 #############################################################
 UTIL-LINUX_VERSION:=2.12r
 UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VERSION).tar.bz2
-UTIL-LINUX_SITE:=http://www.kernel.org/pub/linux/utils/util-linux
+UTIL-LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/util-linux
 UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VERSION)
 UTIL-LINUX_CAT:=$(BZCAT)
 UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/chkdupexe

diff --git a/target/device/Config.in.mirrors b/target/device/Config.in.mirrors
index 8d4b068c334993d7e70939fd6da5292c363793d7..6dcb72b31a29a4e589bac3e683d68b75a12710ea 100644 (file)
--- a/target/device/Config.in.mirrors
+++ b/target/device/Config.in.mirrors
@@ -12,6 +12,32 @@ config BR2_SOURCEFORGE_MIRROR
          The list of mirrors is available here:
          http://prdownloads.sourceforge.net/index-sf.html?download
 
+config BR2_KERNEL_MIRROR
+       string "Kernel.org mirror"
+       default "http://www.kernel.org/pub/"
+       help
+         kernel.org is mirrored on a number of servers around the world.
+         The following allows you to select your preferred mirror.
+
+         Have a look on the kernel.org site for a list of mirrors, then enter
+         the URL to the base directory.  Examples:
+
+            http://www.XX.kernel.org/pub (XX = country code)
+            http://mirror.aarnet.edu.au/pub/ftp.kernel.org
+
+config BR2_GNU_MIRROR
+       string "GNU Software mirror"
+       default "http://ftp.gnu.org"
+       help
+         GNU has multiple software mirrors scattered around the world.
+         The following allows you to select your preferred mirror.
+
+         Have a look on the gnu.org site for a list of mirrors, then enter
+         the URL to the base directory.  Examples:
+
+            http://ftp.gnu.org/pub/gnu (XX = country code)
+            http://mirror.aarnet.edu.au/pub/gnu
+
 source "target/device/Atmel/Config.in.mirrors"
 
 endmenu

diff --git a/target/device/Sharp/LNode80/linux.mk b/target/device/Sharp/LNode80/linux.mk
index 4dcef714b6161ace9cd8ef77fa36aefd50cc1802..880b550ac7410856706b110c19847a62e931a077 100644 (file)
--- a/target/device/Sharp/LNode80/linux.mk
+++ b/target/device/Sharp/LNode80/linux.mk
@@ -50,7 +50,7 @@ LINUX_BINLOC=arch/$(LINUX_KARCH)/boot/$(LINUX_FORMAT)
 LINUX_DIR=$(BUILD_DIR)/linux-lnode80
 LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
 LINUX_CAT:=$(BZCAT)
-LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4
+LINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.4
 # Used by pcmcia-cs and others
 LINUX_SOURCE_DIR=$(LINUX_DIR)
 

diff --git a/target/device/Soekris/net4521/linux.mk b/target/device/Soekris/net4521/linux.mk
index 8e0b3be9738fc50176b814a0c0f7e7f62f258a86..c62e1de54d0dd8cd0c0795bb839b8520d68d21a8 100644 (file)
--- a/target/device/Soekris/net4521/linux.mk
+++ b/target/device/Soekris/net4521/linux.mk
@@ -51,7 +51,7 @@ LINUX_BINLOC=arch/$(LINUX_KARCH)/boot/$(LINUX_FORMAT)
 LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
 LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
 LINUX_CAT:=$(BZCAT)
-LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4
+LINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.4
 # Used by pcmcia-cs and others
 LINUX_SOURCE_DIR=$(LINUX_DIR)
 

diff --git a/target/device/Via/epia-mii/linux.mk b/target/device/Via/epia-mii/linux.mk
index 9b5ea4600ccb18323ba9b505c8c2d445d9c0a291..2d5f7e899fcb6bd25ae1e4fb5d6d69995ff3e015 100644 (file)
--- a/target/device/Via/epia-mii/linux.mk
+++ b/target/device/Via/epia-mii/linux.mk
@@ -38,7 +38,7 @@ LINUX_BINLOC=arch/$(LINUX_KARCH)/boot/$(LINUX_FORMAT)
 LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
 LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
 LINUX_CAT:=$(BZCAT)
-LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.6
+LINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
 LINUX_KCONFIG=target/device/Via/epia-mii/linux.config
 LINUX_KERNEL=$(BUILD_DIR)/buildroot-kernel
 # Used by pcmcia-cs and others

diff --git a/target/device/jp/q5/linux.mk b/target/device/jp/q5/linux.mk
index 3a277f8e03e6790bede5fd8297d9d60b6530fba8..512aba08371cb82440343ce71a8840f9dc1251ef 100644 (file)
--- a/target/device/jp/q5/linux.mk
+++ b/target/device/jp/q5/linux.mk
@@ -50,7 +50,7 @@ LINUX_BINLOC=$(LINUX_FORMAT)
 LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
 LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
 LINUX_CAT:=$(BZCAT)
-LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4
+LINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.4
 # Used by pcmcia-cs and others
 LINUX_SOURCE_DIR=$(LINUX_DIR)
 

diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index 14d4e085ed6c84aed77e17485c6dfd7025f5f517..1d9f8595d426a9b293f73626b9a7322743b377e8 100644 (file)
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -23,7 +23,7 @@ endif
 
 LINUX26_SOURCE=linux-$(DOWNLOAD_LINUX26_VERSION).tar.bz2
 LINUX26_BZCAT:=$(BZCAT)
-LINUX26_SITE=http://ftp.kernel.org/pub/linux/kernel/v2.6
+LINUX26_SITE=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
 
 ifeq ($(BOARD_PATH),)
 BOARD_PATH:=$(strip $(subst ",,$(BR2_BOARD_PATH)))

diff --git a/target/x86/syslinux/syslinux.mk b/target/x86/syslinux/syslinux.mk
index 69953c4dc172b0ecb44ef65cc50286b5045025c1..a238fbed610f3e86af066742f9d7c0f063d2b38e 100644 (file)
--- a/target/x86/syslinux/syslinux.mk
+++ b/target/x86/syslinux/syslinux.mk
@@ -27,7 +27,7 @@ SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
 SYSLINUX_DIR2=$(TOOL_BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
 SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2
 SYSLINUX_CAT:=$(BZCAT)
-SYSLINUX_SITE=http://www.kernel.org/pub/linux/utils/boot/syslinux
+SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
 SYSLINUX_BIN=$(SYSLINUX_DIR2)/mtools/syslinux
 
 

diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index e2210d06c5dc977ad9c7b14f1c23713700e4108e..1e003f2e316e9b0bfeb4edba9287d4c8f4e5b327 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -24,7 +24,7 @@ ifneq ($(BR2_TOOLCHAIN_SYSROOT),y)
 
 ifeq ($(GCC_SNAP_DATE),)
 GCC_OFFICIAL_VER:=$(GCC_VERSION)
-GCC_SITE:=http://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION)
+GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
 #GCC_SITE:=ftp://ftp.ibiblio.org/pub/mirrors/gnu/ftp/gnu/gcc/gcc-$(GCC_OFFICIAL_VER)
 else
 GCC_OFFICIAL_VER:=$(GCC_VERSION)-$(GCC_SNAP_DATE)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index cbf5095558e5e458c810344c5310fbdc4c70703c..c6ecabadde89754e57d7823cc067aef3dd9a9b73 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -22,7 +22,7 @@ ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
 
 ifeq ($(GCC_SNAP_DATE),)
 GCC_OFFICIAL_VER:=$(GCC_VERSION)
-GCC_SITE:=http://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION)
+GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
 #GCC_SITE:=ftp://ftp.ibiblio.org/pub/mirrors/gnu/ftp/gnu/gcc/gcc-$(GCC_OFFICIAL_VER)
 else
 GCC_OFFICIAL_VER:=$(GCC_VERSION)-$(GCC_SNAP_DATE)

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 864dd1c5551fda5f2cfc8c556c36fe41e653e214..933ffb2072a39281e894bc71d58ef3ef4454ebbd 100644 (file)
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -21,7 +21,7 @@ GDB_PATCH_DIR:=toolchain/gdb/$(GDB_VERSION)
 else
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-GDB_SITE:=http://ftp.gnu.org/gnu/gdb
+GDB_SITE:=$(BR2_GNU_MIRROR)/gdb
 else
 GDB_SITE:=$(VENDOR_SITE)
 endif

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 706cc723ec3314004069c160ec2e6a28f6d0a28d..9c70f709d57959b3cdf0af4310857965239c8e03 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -514,7 +514,8 @@ uclibc-clean:
 uclibc-dirclean:
        rm -rf $(UCLIBC_DIR)
 
-uclibc-target-utils: $(TARGET_DIR)/usr/bin/ldd
+uclibc-target-utils: 
+#$(TARGET_DIR)/usr/bin/ldd
 
 uclibc-target-utils-source: $(DL_DIR)/$(UCLIBC_SOURCE)