update to vzkernel-2.6.32-042stab113.12.src.rpm

[pve-kernel-2.6.32.git] / assemble-firmware.pl

diff --git a/assemble-firmware.pl b/assemble-firmware.pl
index 1132175aebb2dd243ef3e5a5e7e59077bd7ce1ef..e6134d3bf6c4a3ae44f24b5f4442d1bc7a21c911 100755 (executable)
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -24,7 +24,8 @@ my $skip = {};
 # debian squeeze also misses those files
 foreach my $fw (qw(
 libertas/gspi8385.bin libertas/gspi8385_hlp.bin
-cbfw.bin ctfw.bin ct2fw.bin
+ctfw.bin ct2fw.bin ctfw-3.0.3.1.bin ct2fw-3.0.3.1.bin
+cbfw.bin cbfw-3.0.3.1.bin 
 tehuti/firmware.bin
 cyzfirm.bin
 isi4616.bin
@@ -192,14 +193,14 @@ while(defined(my $line = <TMP>)) {
 
     my $name = basename($fw);
 
-    my $sr = `find '$fwsrc1' -name '$name'`;
+    my $sr = `find '$fwsrc1' -type f -name '$name'`;
     chomp $sr;
     if ($sr) {
        #print "found $fw in $sr\n";
        copy_fw($sr, $fwdest);
        next;
     }
-    $sr = `find '$fwsrc3' -name '$name'`;
+    $sr = `find '$fwsrc3' -type f -name '$name'`;
     chomp $sr;
     if ($sr) {
        #print "found $fw in $sr\n";