linux/3.3: add missing RTC symbol

[oweals/openwrt.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index 08949d698aa49dd375e4dfbc14fb831e27dde61e..86a6bf46578a5f2799b10f8eb27b1860fc0166b4 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -9,6 +9,7 @@
 use strict;
 use warnings;
 use File::Basename;
+use File::Copy;
 
 @ARGV > 2 or die "Syntax: $0 <target dir> <filename> <md5sum> [<mirror> ...]\n";
 
@@ -24,7 +25,7 @@ sub localmirrors {
        open LM, "$scriptdir/localmirrors" and do {
            while (<LM>) {
                        chomp $_;
-                       push @mlist, $_;
+                       push @mlist, $_ if $_;
                }
                close LM;
        };
@@ -74,7 +75,29 @@ sub download
                if(! -d $target) {
                        system("mkdir -p $target/");
                }
-               system("cp -vf $cache/$filename $target/$filename.dl") == 0 or return;
+               if (open TMPDLS, "find $cache -follow -name $filename 2>/dev/null |"){
+                       my $i = 0;
+                       my $link = "";
+                       while (defined($link = readline TMPDLS)) {
+                               chomp $link;
+                               $i++;
+                               if ($i > 1) {
+                                       print("$i or more instances of $filename in $cache found . Only one instance allowed.\n");
+                                       return;
+                               }
+                       }
+                       close TMPDLS;
+                       if ($i < 1) {
+                               print("No instances of $filename found in $cache.\n");
+                               return;
+                       } elsif ($i == 1){
+                               print("Copying $filename from $link\n");
+                               copy($link, "$target/$filename.dl");
+                       }
+               } else {
+                       print("Failed to search for $filename in $cache\n");
+                       return;
+               }
                system("$md5cmd $target/$filename.dl > \"$target/$filename.md5sum\" ") == 0 or return;
        } else {
                open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
@@ -142,8 +165,6 @@ foreach my $mirror (@ARGV) {
                        push @extra, "$extra[0]/longterm/v$1";
                }               
                foreach my $dir (@extra) {
-                       push @mirrors, "ftp://ftp.geo.kernel.org/pub/$dir";
-                       push @mirrors, "http://ftp.geo.kernel.org/pub/$dir";
                        push @mirrors, "ftp://ftp.all.kernel.org/pub/$dir";
                        push @mirrors, "http://ftp.all.kernel.org/pub/$dir";
                        push @mirrors, "ftp://ftp.de.kernel.org/pub/$dir";