qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 23:46:16 +02:00
Code

[backfire] merge r24686 and r24688

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24689 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-12-18 21:44:36 +00:00
parent d250cd4ca7
commit 81756d0089
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/download.mk
View File

@ -11,7 +11,7 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
define dl_method define dl_method
$(strip \ $(strip \
$(if $(2),$(2), \ $(if $(2),$(2), \
$(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \ $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% https://% file://%,$(1)),default, \
$(if $(filter git://%,$(1)),git, \ $(if $(filter git://%,$(1)),git, \
$(if $(filter svn://%,$(1)),svn, \ $(if $(filter svn://%,$(1)),svn, \
$(if $(filter cvs://%,$(1)),cvs, \ $(if $(filter cvs://%,$(1)),cvs, \

2
scripts/download.pl
View File

@ -77,7 +77,7 @@ sub download
system("cp -vf $cache/$filename $target/$filename.dl") == 0 or return; system("cp -vf $cache/$filename $target/$filename.dl") == 0 or return;
system("$md5cmd $target/$filename.dl > \"$target/$filename.md5sum\" ") == 0 or return; system("$md5cmd $target/$filename.dl > \"$target/$filename.md5sum\" ") == 0 or return;
} else { } else {
open WGET, "wget -t5 --timeout=20 $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n"; open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- \"$mirror/$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;