X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=assemble-firmware.pl;h=e6134d3bf6c4a3ae44f24b5f4442d1bc7a21c911;hb=00f373c6786c977f4df4374c9391ad5030c52bc8;hp=1a507b84e531be339fac268ff9d77baa51a927c2;hpb=1cfff965632218b0c4272ccdaace8d38c3dc4505;p=pve-kernel-2.6.32.git

diff --git a/assemble-firmware.pl b/assemble-firmware.pl
index 1a507b8..e6134d3 100755
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -6,7 +6,6 @@ use File::Path;
 
 my $fwsrc0 = "linux-2.6-2.6.32/firmware";
 my $fwsrc1 = "linux-firmware.git";
-my $fwsrc2 = "linux-firmware-from-kernel.git";
 my $fwsrc3 = "firmware-misc";
 
 my $fwlist = shift;
@@ -25,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
+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
@@ -73,9 +73,6 @@ isl3886usb
 isl3886pci
 3826.arm
 
-rtl8168d-1.fw
-rtl8168d-2.fw
-
 i2400m-fw-sdio-1.3.sbcf
 
 nx3fwmn.bin
@@ -104,6 +101,7 @@ b43/ucode15.fw
 b43/ucode14.fw
 b43/ucode13.fw
 b43/ucode11.fw
+b43/ucode16_mimo.fw
 orinoco_ezusb_fw
 isl3890
 isl3886
@@ -113,8 +111,12 @@ mwl8k/helper_8366.fw
 mwl8k/fmimage_8363.fw
 mwl8k/helper_8363.fw
 iwlwifi-6000g2a-4.ucode
+iwlwifi-6000g2a-6.ucode
 iwlwifi-130-5.ucode
+iwlwifi-100-6.ucode
+iwlwifi-1000-6.ucode
 cxgb4/t4fw.bin
+cxgb4/t4fw-1.3.10.0.bin
 
 )) {
     $skip->{$fw} = 1;
@@ -169,7 +171,9 @@ while(defined(my $line = <TMP>)) {
 	$fw = 'cis/PE520.cis';
     }
  
-    if (-f "$fwsrc0/$fw") {
+    # the rtl_nic/rtl8168d-1.fw file is buggy in current kernel tree
+    if (-f "$fwsrc0/$fw" && 
+	($fw ne 'rtl_nic/rtl8168d-1.fw')) { 
 	copy_fw("$fwsrc0/$fw", $fwdest);
 	next;
     }
@@ -177,10 +181,6 @@ while(defined(my $line = <TMP>)) {
 	copy_fw("$fwsrc1/$fw", $fwdest);
 	next;
     }
-    if (-f "$fwsrc2/$fw") {
-	copy_fw("$fwsrc2/$fw", $fwdest);
-	next;
-    }
     if (-f "$fwsrc3/$fw") {
 	copy_fw("$fwsrc3/$fw", $fwdest);
 	next;
@@ -193,21 +193,14 @@ while(defined(my $line = <TMP>)) {
 
     my $name = basename($fw);
 
-    my $sr = `find '$fwsrc1' -name '$name'`;
-    chomp $sr;
-    if ($sr) {
-	#print "found $fw in $sr\n";
-	copy_fw($sr, $fwdest);
-	next;
-    }
-    $sr = `find '$fwsrc2' -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";