include latest broadcom bnx2/bnx2x drivers

diff --git a/Makefile b/Makefile
index 5598afee86695d9b837fbbbc6582af01af3e74b3..4020216f43cafb022533ac0424765d6844006071 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,9 @@ IGBSRC=${IGBDIR}.tar.gz
 IXGBEDIR=ixgbe-3.11.33
 IXGBESRC=${IXGBEDIR}.tar.gz
 
+BNX2DIR=netxtreme2-7.4.27
+BNX2SRC=${BNX2DIR}.tar.gz
+
 #ARECADIR=arcmsr.1.20.0X.15-110330
 #ARECASRC=${ARECADIR}.zip
 
@@ -87,7 +90,7 @@ fwlist-${KVNAME}: data
        ./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
        mv fwlist.tmp $@
 
-data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko iscsi_trgt.ko
+data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko
        rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
        mkdir tmp/boot
        install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
@@ -102,6 +105,10 @@ data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko iscsi_trgt.ko
        install -m 644 e1000e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/e1000e/
        # install latest ibg driver
        install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/igb/
+       # install bnx2 drivers
+       install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
+       install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
+       install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/bnx2x/
        # install areca driver
        #install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
        # install iscsitarget module
@@ -182,6 +189,15 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
        cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
+bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
+       rm -rf ${BNX2DIR}
+       tar xf ${BNX2SRC}
+       mkdir -p /lib/modules/${KVNAME}
+       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+       cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME}
+       cd ${BNX2DIR}; make -C bnx2x/src KVER=${KVNAME}
+       cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
+
 #arcmsr.ko: .compile_mark ${ARECASRC}
 #      rm -rf ${ARECADIR}
 #      unzip ${ARECASRC}
@@ -271,7 +287,8 @@ distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} iscsi_trgt.ko ${ISCSITARGETDIR}
+       rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} iscsi_trgt.ko ${ISCSITARGETDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko
+
 
 
 

diff --git a/README b/README
index 61597036502deced5d9631ce3f6cb80a62c46b61..fd3952af35d4d3ad40e1778495749dd25a4f50db 100644 (file)
--- a/README
+++ b/README
@@ -19,6 +19,11 @@ Additional/Updated Modules:
 
 - include latest e1000e driver from intel/sourceforge
 
+- include latest broadcom bnx2 drivers
+
+  * original file linux-7.4.27.zip contains
+    netxtreme2-7.4.27.tar.gz (added to repository)
+
 FIRMWARE:
 =========
 

diff --git a/changelog.Debian b/changelog.Debian
index 58ae839f4cbd169a5ef4afa2ae51e67a58065950..278956558e11c27edd65caba5dd1a9070ac4c07b 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,7 +1,13 @@
+pve-kernel-2.6.32 (2.6.32-88) unstable; urgency=low
+
+  * include latest broadcom bnx2/bnx2x drivers
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 25 Jan 2013 11:14:53 +0100
+
 pve-kernel-2.6.32 (2.6.32-87) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab072.10.src.rpm
-
+  
  -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Jan 2013 11:54:31 +0100
 
 pve-kernel-2.6.32 (2.6.32-86) unstable; urgency=low

diff --git a/netxtreme2-7.4.27.tar.gz b/netxtreme2-7.4.27.tar.gz
new file mode 100755 (executable)
index 0000000..64ba04c
Binary files /dev/null and b/netxtreme2-7.4.27.tar.gz differ

diff --git a/proxmox-ve/changelog.Debian b/proxmox-ve/changelog.Debian
index 2b6d94b02a98762c88522e15d1b47e4ff878a119..1d2d55b1be5d77da33196db6f1edd595356477a2 100644 (file)
--- a/proxmox-ve/changelog.Debian
+++ b/proxmox-ve/changelog.Debian
@@ -1,4 +1,4 @@
-proxmox-ve-2.6.32 (2.2-87) unstable; urgency=low
+proxmox-ve-2.6.32 (2.2-88) unstable; urgency=low
 
   * re-package to update version number