include correct rtl8168d-1.fw file

diff --git a/Makefile b/Makefile
index 16ff75d7f61ed9167a1a5dca7db9fb63cb1b6176..b7c169e17dcb2a515256427085df4b11da9c15d6 100644 (file)
--- 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 2eeb1320dcbf09a1d5a22da60ca60998f468b4f5..1132175aebb2dd243ef3e5a5e7e59077bd7ce1ef 100755 (executable)
--- 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 89afb4783841b81a3274af824cd706f598865260..6bbc9c86bff57048d8f4febf5f46b2d4fcf8f93c 100644 (file)
--- 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