summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@free.fr>2012-08-12 11:45:42 (GMT)
committerAustin Morton <austinpmorton@gmail.com>2012-08-12 11:45:42 (GMT)
commit15bde07c864366a4c6ec12ddaf6587f9ee081a64 (patch)
tree1793dc5b7f6f55f56feb4a0c310c31d4ee744304
parentcf8093447f728ee8b6f3375b7131800ebb688bfa (diff)
scripts: add option to only use the mirror
Currently, if downloads are forbidden, the mirror is still tried for. Change this way: - if downlaods forbidden, do not try neither upstream locations nor mirror - add option to only use the mirror, and avoid upstream locations Signed-off-by: Austin Morton <austinpmorton@gmail.com> [yann.morin.1998@free.fr: broaden the if USE_MIRRORto enclode mirror location] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-rw-r--r--config/global/download.in17
-rw-r--r--scripts/functions8
2 files changed, 21 insertions, 4 deletions
diff --git a/config/global/download.in b/config/global/download.in
index 05ca59c..370d97b 100644
--- a/config/global/download.in
+++ b/config/global/download.in
@@ -55,8 +55,6 @@ config ONLY_DOWNLOAD
Useful to pre-retrieve the tarballs before going off-line.
-endif # ! FORBID_DOWNLOAD
-
config USE_MIRROR
bool
prompt "Use a mirror"
@@ -69,10 +67,19 @@ config USE_MIRROR
*not* on your LAN, for example on another subnet of your company's
network, or a mirror on the Internet.
+if USE_MIRROR
+
+config FORCE_MIRROR
+ bool
+ prompt "Only use mirror"
+ help
+ Only allow downloading from the mirror specified, other download locations
+ will NOT be used, and the package will fail to be located if not present
+ on the mirror provided
+
config MIRROR_BASE_URL
string
prompt "Base URL"
- depends on USE_MIRROR
default "http://crosstool-ng.org/mirrors/"
help
This is the base URL searched in for tarballs.
@@ -90,3 +97,7 @@ config MIRROR_BASE_URL
The mirror is available at:
http://crosstool-ng.org/mirrors/
+
+endif # USE_MIRROR
+
+endif # ! FORBID_DOWNLOAD
diff --git a/scripts/functions b/scripts/functions
index 4a91f7d..9bbc753 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -555,6 +555,12 @@ CT_GetFile() {
fi
# No, it does not...
+ # If not allowed to download from the Internet, don't
+ if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then
+ CT_DoLog DEBUG "Not allowed to download from the Internet, aborting ${file} download"
+ return 1
+ fi
+
# Try to retrieve the file
CT_DoLog EXTRA "Retrieving '${file}'"
@@ -565,7 +571,7 @@ CT_GetFile() {
URLS+=( "${CT_MIRROR_BASE_URL}" )
fi
- if [ "${CT_FORBID_DOWNLOAD}" != "y" ]; then
+ if [ "${CT_FORCE_MIRROR}" != "y" ]; then
URLS+=( "${@}" )
fi