From e0d3df03ddc6f3a42a133a18169d1b18056fc323 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 7 Dec 2020 23:43:32 +0100 Subject: [PATCH] - introduce GNU_MIRROR variable --- make/environment-build.mk | 2 ++ make/host-tools.mk | 4 ++-- make/target-libs.mk | 4 ++-- make/target-tools-unused.mk | 4 ++-- make/target-tools.mk | 10 +++++----- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/make/environment-build.mk b/make/environment-build.mk index f7e8a413..596d4308 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -314,6 +314,8 @@ GITHUB_SSH = git@github.com BITBUCKET = https://bitbucket.org BITBUCKET_SSH = git@bitbucket.org +GNU_MIRROR = http://ftp.gnu.org/pub/gnu + NI-PUBLIC = $(GITHUB)/neutrino-images NI-PRIVATE = $(BITBUCKET_SSH):neutrino-images diff --git a/make/host-tools.mk b/make/host-tools.mk index 4a243406..7888223d 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -177,7 +177,7 @@ host-zic: $(DL_DIR)/$(HOST_TZDATA_SOURCE) $(DL_DIR)/$(HOST_TZCODE_SOURCE) | $(HO HOST_PARTED_VER = $(PARTED_VER) HOST_PARTED_DIR = parted-$(HOST_PARTED_VER) HOST_PARTED_SOURCE = parted-$(HOST_PARTED_VER).tar.xz -HOST_PARTED_SITE = https://ftp.gnu.org/gnu/parted +HOST_PARTED_SITE = $(GNU_MIRROR)/parted #$(DL_DIR)/$(HOST_PARTED_SOURCE): # $(DOWNLOAD) $(HOST_PARTED_SITE)/$(HOST_PARTED_SOURCE) @@ -234,7 +234,7 @@ host-dosfstools: $(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR) HOST_MTOOLS_VER = 4.0.19 HOST_MTOOLS_DIR = mtools-$(HOST_MTOOLS_VER) HOST_MTOOLS_SOURCE = mtools-$(HOST_MTOOLS_VER).tar.gz -HOST_MTOOLS_SITE = ftp://ftp.gnu.org/gnu/mtools +HOST_MTOOLS_SITE = $(GNU_MIRROR)/mtools $(DL_DIR)/$(HOST_MTOOLS_SOURCE): $(DOWNLOAD) $(HOST_MTOOLS_SITE)/$(HOST_MTOOLS_SOURCE) diff --git a/make/target-libs.mk b/make/target-libs.mk index e5adf277..e2d1e8bb 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -379,7 +379,7 @@ endif NCURSES_VER = 6.1 NCURSES_DIR = ncurses-$(NCURSES_VER) NCURSES_SOURCE = ncurses-$(NCURSES_VER).tar.gz -NCURSES_SITE = https://ftp.gnu.org/pub/gnu/ncurses +NCURSES_SITE = $(GNU_MIRROR)/ncurses $(DL_DIR)/$(NCURSES_SOURCE): $(DOWNLOAD) $(NCURSES_SITE)/$(NCURSES_SOURCE) @@ -1343,7 +1343,7 @@ popt: $(DL_DIR)/$(POPT_SOURCE) | $(TARGET_DIR) LIBICONV_VER = 1.15 LIBICONV_DIR = libiconv-$(LIBICONV_VER) LIBICONV_SOURCE = libiconv-$(LIBICONV_VER).tar.gz -LIBICONV_SITE = https://ftp.gnu.org/gnu/libiconv +LIBICONV_SITE = $(GNU_MIRROR)/libiconv $(DL_DIR)/$(LIBICONV_SOURCE): $(DOWNLOAD) $(LIBICONV_SITE)/$(LIBICONV_SOURCE) diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index 99ee8e3c..8495f565 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -43,7 +43,7 @@ usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR) BINUTILS_VER = 2.35 BINUTILS_DIR = binutils-$(BINUTILS_VER) BINUTILS_SOURCE = binutils-$(BINUTILS_VER).tar.bz2 -BINUTILS_SITE = https://ftp.gnu.org/gnu/binutils +BINUTILS_SITE = $(GNU_MIRROR)/binutils $(DL_DIR)/$(BINUTILS_SOURCE): $(DOWNLOAD) $(BINUTILS_SITE)/$(BINUTILS_SOURCE) @@ -172,7 +172,7 @@ iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR) READLINE_VER = 8.0 READLINE_DIR = readline-$(READLINE_VER) READLINE_SOURCE = readline-$(READLINE_VER).tar.gz -READLINE_SITE = https://ftp.gnu.org/gnu/readline +READLINE_SITE = $(GNU_MIRROR)/readline $(DL_DIR)/$(READLINE_SOURCE): $(DOWNLOAD) $(READLINE_SITE)/$(READLINE_SOURCE) diff --git a/make/target-tools.mk b/make/target-tools.mk index 0369bfbf..0ff63fbd 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -315,7 +315,7 @@ iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR) PARTED_VER = 3.2 PARTED_DIR = parted-$(PARTED_VER) PARTED_SOURCE = parted-$(PARTED_VER).tar.xz -PARTED_SITE = https://ftp.gnu.org/gnu/parted +PARTED_SITE = $(GNU_MIRROR)/parted $(DL_DIR)/$(PARTED_SOURCE): $(DOWNLOAD) $(PARTED_SITE)/$(PARTED_SOURCE) @@ -398,7 +398,7 @@ hd-idle: $(DL_DIR)/$(HD-IDLE_SOURCE) | $(TARGET_DIR) COREUTILS_VER = 8.30 COREUTILS_DIR = coreutils-$(COREUTILS_VER) COREUTILS_SOURCE = coreutils-$(COREUTILS_VER).tar.xz -COREUTILS_SITE = https://ftp.gnu.org/gnu/coreutils +COREUTILS_SITE = $(GNU_MIRROR)/coreutils $(DL_DIR)/$(COREUTILS_SOURCE): $(DOWNLOAD) $(COREUTILS_SITE)/$(COREUTILS_SOURCE) @@ -775,7 +775,7 @@ minicom: $(MINICOM_DEPS) $(DL_DIR)/$(MINICOM_SOURCE) | $(TARGET_DIR) BASH_VER = 5.0 BASH_DIR = bash-$(BASH_VER) BASH_SOURCE = bash-$(BASH_VER).tar.gz -BASH_SITE = http://ftp.gnu.org/gnu/bash +BASH_SITE = $(GNU_MIRROR)/bash $(DL_DIR)/$(BASH_SOURCE): $(DOWNLOAD) $(BASH_SITE)/$(BASH_SOURCE) @@ -1523,7 +1523,7 @@ streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR) GETTEXT_VER = 0.19.8.1 GETTEXT_DIR = gettext-$(GETTEXT_VER) GETTEXT_SOURCE = gettext-$(GETTEXT_VER).tar.xz -GETTEXT_SITE = ftp://ftp.gnu.org/gnu/gettext +GETTEXT_SITE = $(GNU_MIRROR)/gettext $(DL_DIR)/$(GETTEXT_SOURCE): $(DOWNLOAD) $(GETTEXT_SITE)/$(GETTEXT_SOURCE) @@ -1600,7 +1600,7 @@ mc: $(MC_DEPS) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR) WGET_VER = 1.20.3 WGET_DIR = wget-$(WGET_VER) WGET_SOURCE = wget-$(WGET_VER).tar.gz -WGET_SITE = https://ftp.gnu.org/gnu/wget +WGET_SITE = $(GNU_MIRROR)/wget $(DL_DIR)/$(WGET_SOURCE): $(DOWNLOAD) $(WGET_SITE)/$(WGET_SOURCE)