diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-02-29 20:02:34 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-02-29 20:02:34 +0000 |
| commit | 42eb04666165c474c083e0b19dce7732fb167e3a (patch) | |
| tree | 860a02ee47e515680eb5595be557b33ac00d4abd | |
| parent | f3a1db04f0ebba577598f1577d3c8c756c8bf757 (diff) | |
| download | upstream-42eb04666165c474c083e0b19dce7732fb167e3a.tar.gz upstream-42eb04666165c474c083e0b19dce7732fb167e3a.tar.bz2 upstream-42eb04666165c474c083e0b19dce7732fb167e3a.zip | |
build: add support for choosing a different url filename part than the output file
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r47591
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48823 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/download.mk | 5 | ||||
| -rwxr-xr-x | scripts/download.pl | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/download.mk b/include/download.mk index 937b5d3b63..8a1205df00 100644 --- a/include/download.mk +++ b/include/download.mk @@ -44,11 +44,11 @@ define DownloadMethod/unknown endef define DownloadMethod/default - $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MD5SUM)" $(foreach url,$(URL),"$(url)") + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MD5SUM)" "$(URL_FILE)" $(foreach url,$(URL),"$(url)") endef define wrap_mirror - $(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" || ( $(1) ),$(1)) + $(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "" "$(MIRROR_MD5SUM)" || ( $(1) ),$(1)) endef define DownloadMethod/cvs @@ -157,6 +157,7 @@ Validate/darcs=VERSION SUBDIR define Download/Defaults URL:= FILE:= + URL_FILE:= PROTO:= MD5SUM:= SUBDIR:= diff --git a/scripts/download.pl b/scripts/download.pl index cd68a7bcd0..111d03c633 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -11,15 +11,19 @@ use warnings; use File::Basename; use File::Copy; -@ARGV > 2 or die "Syntax: $0 <target dir> <filename> <md5sum> [<mirror> ...]\n"; +@ARGV > 2 or die "Syntax: $0 <target dir> <filename> <md5sum> <url filename> [<mirror> ...]\n"; +my $url_filename; my $target = shift @ARGV; my $filename = shift @ARGV; my $md5sum = shift @ARGV; +$url_filename = shift @ARGV unless $ARGV[0] =~ /:\/\//; my $scriptdir = dirname($0); my @mirrors; my $ok; +$url_filename or $url_filename = $filename; + sub localmirrors { my @mlist; open LM, "$scriptdir/localmirrors" and do { @@ -106,7 +110,7 @@ sub download return; } } else { - open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- '$mirror/$filename' |" or die "Cannot launch wget.\n"; + open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- '$mirror/$url_filename' |" or die "Cannot launch wget.\n"; open MD5SUM, "| $md5cmd > '$target/$filename.md5sum'" or die "Cannot launch md5sum.\n"; open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n"; my $buffer; |