[pve-devel] r5176 - pve-kernel-2.6.32/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-09-20 08:58:41 +0000 (Mon, 20 Sep 2010)
New Revision: 5176

Added:
   pve-kernel-2.6.32/trunk/netxtreme2-5.2.55.tar.gz
Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/README
   pve-kernel-2.6.32/trunk/changelog.Debian
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-09-17 16:02:14 UTC (rev 5175)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-09-20 08:58:41 UTC (rev 5176)
@@ -3,7 +3,7 @@
 KERNEL_VER=2.6.32
 KERNEL_DEB_REL=22
 
-PKGREL=18
+PKGREL=19
 KREL=3
 
 EXTRAVERSION=-${KREL}-pve
@@ -31,7 +31,10 @@
 
 IXGBEDIR=ixgbe-2.1.4
 IXGBESRC=${IXGBEDIR}.tar.gz
+BNX2DIR=netxtreme2-5.2.55
+BNX2SRC=${BNX2DIR}.tar.gz
 
+
 SCSTDIR=scst
 SCSTSRC=scst-snap-21.12.09.tgz
 ISCSIDIR=iscsi-scst
@@ -79,7 +82,7 @@
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-data: .compile_mark config-${KERNEL_VER} aoe.ko ixgbe.ko iscsi-scst.ko scst-modules.tar
+data: .compile_mark config-${KERNEL_VER} aoe.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi-scst.ko scst-modules.tar
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 config-${KERNEL_VER} tmp/boot/config-${KVNAME}
@@ -92,6 +95,10 @@
 	install -m 644 aoe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/aoe/aoe.ko
 	# install latest ixgbe driver
 	install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ixgbe/
+	# install bnx2 and tg3 drivers
+	install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
+	install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
+	install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
 	# install scst modules
 	install -m 644 -D iscsi-scst.ko tmp/lib/modules/${KVNAME}/extra/scst/iscsi-scst.ko
 	tar xf scst-modules.tar -C tmp/lib/modules/${KVNAME}/extra/scst
@@ -154,6 +161,13 @@
 	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}/linux-2.6.24-openvz /lib/modules/${KVNAME}/build
+	cd ${BNX2DIR}; make KVER=${KVNAME}
+	cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
 
 scst-src/AskingQuestions:
 	#svn co https://scst.svn.sourceforge.net/svnroot/scst/trunk scst-src
@@ -274,6 +288,6 @@
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data busybox busybox.tar ${BUSYBOXDIR} pci.ids proxmox-ve/data initrd.img-${KVNAME} *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp fwlist.initrd iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR}
+	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data busybox busybox.tar ${BUSYBOXDIR} pci.ids proxmox-ve/data initrd.img-${KVNAME} *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp fwlist.initrd iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko
 
 

Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README	2010-09-17 16:02:14 UTC (rev 5175)
+++ pve-kernel-2.6.32/trunk/README	2010-09-20 08:58:41 UTC (rev 5176)
@@ -19,6 +19,12 @@
 
 - include latest ixgbe deriver from intel/sourceforge
 
+- include latest broadcom bnx2 drivers
+        
+        * original file linux-5.2.55.zip contains
+        netxtreme2-5.2.55.tar.gz (added to repository)
+
+
 FIRMWARE:
 =========
 

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-09-17 16:02:14 UTC (rev 5175)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-09-20 08:58:41 UTC (rev 5176)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-19) unstable; urgency=low
+
+  * include latest broadcom bnx2, bnx2x drivers
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 20 Sep 2010 10:56:45 +0200
+
 pve-kernel-2.6.32 (2.6.32-18) unstable; urgency=low
 
   * fix previous fix: see http://sota.gen.nz/compat1/ and

Added: pve-kernel-2.6.32/trunk/netxtreme2-5.2.55.tar.gz
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32/trunk/netxtreme2-5.2.55.tar.gz
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream