From cb815ae003d40cc971d6e214415c10e9a160ba82 Mon Sep 17 00:00:00 2001 From: Ivan Kuten Date: Mon, 17 Dec 2007 12:29:06 +0000 Subject: [PATCH] Add support for GNU and kernel.org mirrors --- package/ed/ed.mk | 2 +- package/hotplug/hotplug.mk | 2 +- package/tar/tar.mk | 2 +- package/tftpd/tftpd.mk | 2 +- package/util-linux/util-linux.mk | 2 +- target/device/Config.in.mirrors | 26 ++++++++++++++++++++++++++ target/device/Sharp/LNode80/linux.mk | 2 +- target/device/Soekris/net4521/linux.mk | 2 +- target/device/Via/epia-mii/linux.mk | 2 +- target/device/jp/q5/linux.mk | 2 +- target/linux/Makefile.in | 2 +- target/x86/syslinux/syslinux.mk | 2 +- toolchain/gcc/gcc-uclibc-3.x.mk | 2 +- toolchain/gcc/gcc-uclibc-4.x.mk | 2 +- toolchain/gdb/gdb.mk | 2 +- toolchain/uClibc/uclibc.mk | 3 ++- 16 files changed, 42 insertions(+), 15 deletions(-) diff --git a/package/ed/ed.mk b/package/ed/ed.mk index 3350121d75..00ce8567ea 100644 --- 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 d9a624499f..2b5659cdeb 100644 --- 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 bcebd03758..99b3042778 100644 --- 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 52f7a7c21d..97d0650b8d 100644 --- 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 caacf55e22..9466a850b8 100644 --- 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 8d4b068c33..6dcb72b31a 100644 --- 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 4dcef714b6..880b550ac7 100644 --- 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 8e0b3be973..c62e1de54d 100644 --- 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 9b5ea4600c..2d5f7e899f 100644 --- 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 3a277f8e03..512aba0837 100644 --- 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 14d4e085ed..1d9f8595d4 100644 --- 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 69953c4dc1..a238fbed61 100644 --- 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 e2210d06c5..1e003f2e31 100644 --- 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 cbf5095558..c6ecabadde 100644 --- 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 864dd1c555..933ffb2072 100644 --- 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 706cc723ec..9c70f709d5 100644 --- 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) -- 2.30.2