[pve-devel] r6600 - pve-kernel-2.6.32/stable

[svn-commits at proxmox.com]

Author: dietmar
Date: 2012-02-13 07:43:00 +0100 (Mon, 13 Feb 2012)
New Revision: 6600

Modified:
   pve-kernel-2.6.32/stable/Makefile
   pve-kernel-2.6.32/stable/assemble-firmware.pl
Log:
do not use linux-firmware-from-kernel.git any longer


Modified: pve-kernel-2.6.32/stable/Makefile
===================================================================
--- pve-kernel-2.6.32/stable/Makefile	2012-02-13 06:15:51 UTC (rev 6599)
+++ pve-kernel-2.6.32/stable/Makefile	2012-02-13 06:43:00 UTC (rev 6600)
@@ -240,10 +240,7 @@
 linux-firmware.git/WHENCE:
 	git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git linux-firmware.git
 
-linux-firmware-from-kernel.git/WHENCE:
-	git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware-from-kernel.git linux-firmware-from-kernel.git
-
-${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE linux-firmware-from-kernel.git/WHENCE changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-5-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-5-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-${KVNAME}
 	rm -rf fwdata
 	mkdir -p fwdata/lib/firmware
 	./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware

Modified: pve-kernel-2.6.32/stable/assemble-firmware.pl
===================================================================
--- pve-kernel-2.6.32/stable/assemble-firmware.pl	2012-02-13 06:15:51 UTC (rev 6599)
+++ pve-kernel-2.6.32/stable/assemble-firmware.pl	2012-02-13 06:43:00 UTC (rev 6600)
@@ -6,7 +6,6 @@
 
 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;
@@ -177,10 +176,6 @@
 	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;
@@ -200,13 +195,6 @@
 	copy_fw($sr, $fwdest);
 	next;
     }
-    $sr = `find '$fwsrc2' -name '$name'`;
-    chomp $sr;
-    if ($sr) {
-	#print "found $fw in $sr\n";
-	copy_fw($sr, $fwdest);
-	next;
-    }
     $sr = `find '$fwsrc3' -name '$name'`;
     chomp $sr;
     if ($sr) {