From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 22 Oct 2012 10:17:32 +0000 (+0200)
Subject: include correct rtl8168d-1.fw file
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d93d8ed17805ccefe2083f6b8bcc89244dd56674;p=pve-kernel-2.6.32.git

include correct rtl8168d-1.fw file
---

diff --git a/Makefile b/Makefile
index 16ff75d..b7c169e 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ KERNEL_CFG=config-${KERNEL_VER}
 KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
 
 FW_VER=1.0
-FW_REL=20
+FW_REL=21
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 AOEDIR=aoe6-77
diff --git a/assemble-firmware.pl b/assemble-firmware.pl
index 2eeb132..1132175 100755
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -72,9 +72,6 @@ isl3886usb
 isl3886pci
 3826.arm
 
-rtl8168d-1.fw
-rtl8168d-2.fw
-
 i2400m-fw-sdio-1.3.sbcf
 
 nx3fwmn.bin
@@ -173,7 +170,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;
     }
diff --git a/changelog.firmware b/changelog.firmware
index 89afb47..6bbc9c8 100644
--- a/changelog.firmware
+++ b/changelog.firmware
@@ -1,3 +1,9 @@
+pve-firmware (1.0-21) unstable; urgency=low
+
+  * include correct rtl8168d-1.fw file
+  
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 22 Oct 2012 11:54:29 +0200
+
 pve-firmware (1.0-19) unstable; urgency=low
 
   *  updates for new 2.6.32-15pve kernel