KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: add support for choosing a different url filename part than the output file

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47591
This commit is contained in:
Felix Fietkau 2015-11-22 19:06:33 +00:00
parent b61e77aedd
commit 9b68fe961b
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/download.mk
View file

@ -42,11 +42,11 @@ define DownloadMethod/unknown
endef endef
define DownloadMethod/default 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 endef
define wrap_mirror 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 endef
define DownloadMethod/cvs define DownloadMethod/cvs
@ -155,6 +155,7 @@ Validate/darcs=VERSION SUBDIR
define Download/Defaults define Download/Defaults
URL:= URL:=
FILE:= FILE:=
URL_FILE:=
PROTO:= PROTO:=
MD5SUM:= MD5SUM:=
SUBDIR:= SUBDIR:=

8
scripts/download.pl
View file

@ -11,15 +11,19 @@ use warnings;
use File::Basename; use File::Basename;
use File::Copy; 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 $target = shift @ARGV;
my $filename = shift @ARGV; my $filename = shift @ARGV;
my $md5sum = shift @ARGV; my $md5sum = shift @ARGV;
$url_filename = shift @ARGV unless $ARGV[0] =~ /:\/\//;
my $scriptdir = dirname($0); my $scriptdir = dirname($0);
my @mirrors; my @mirrors;
my $ok; my $ok;
$url_filename or $url_filename = $filename;
sub localmirrors { sub localmirrors {
my @mlist; my @mlist;
open LM, "$scriptdir/localmirrors" and do { open LM, "$scriptdir/localmirrors" and do {
@ -106,7 +110,7 @@ sub download
return; return;
} }
} else { } 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 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"; open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
my $buffer; my $buffer;