[pve-devel] r6522 - pve-kernel-2.6.32-rh/trunk

svn-commits at proxmox.com svn-commits at proxmox.com
Wed Aug 31 07:33:21 CEST 2011


Author: dietmar
Date: 2011-08-31 07:33:21 +0200 (Wed, 31 Aug 2011)
New Revision: 6522

Added:
   pve-kernel-2.6.32-rh/trunk/e1000e-1.5.1.tar.gz
Removed:
   pve-kernel-2.6.32-rh/trunk/e1000e-1.3.17.tar.gz
Modified:
   pve-kernel-2.6.32-rh/trunk/Makefile
   pve-kernel-2.6.32-rh/trunk/README
   pve-kernel-2.6.32-rh/trunk/changelog.Debian
Log:
  * update e1000e to 1.5.1
  
  * include latest bnx2 drivers



Modified: pve-kernel-2.6.32-rh/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32-rh/trunk/Makefile	2011-08-31 05:24:31 UTC (rev 6521)
+++ pve-kernel-2.6.32-rh/trunk/Makefile	2011-08-31 05:33:21 UTC (rev 6522)
@@ -31,7 +31,7 @@
 AOEDIR=aoe6-77
 AOESRC=${AOEDIR}.tar.gz
 
-E1000EDIR=e1000e-1.3.17
+E1000EDIR=e1000e-1.5.1
 E1000ESRC=${E1000EDIR}.tar.gz
 
 IGBDIR=igb-3.0.22
@@ -40,8 +40,8 @@
 IXGBEDIR=ixgbe-3.3.9
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-#BNX2DIR=netxtreme2-6.2.23
-#BNX2SRC=${BNX2DIR}.tar.gz
+BNX2DIR=netxtreme2-6.2.23
+BNX2SRC=${BNX2DIR}.tar.gz
 
 ARECADIR=arcmsr.1.20.0X.15-110330
 ARECASRC=${ARECADIR}.zip
@@ -87,7 +87,7 @@
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-data: .compile_mark ${KERNEL_CFG} arcmsr.ko aoe.ko e1000e.ko igb.ko ixgbe.ko
+data: .compile_mark ${KERNEL_CFG} arcmsr.ko aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
@@ -102,10 +102,9 @@
 	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 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 bnx2 
+	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 areca driver
 	install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
 	# remove firmware
@@ -185,13 +184,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}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-#	cd ${BNX2DIR}; make KVER=${KVNAME}
-#	cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.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}
+	cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko` .
 
 arcmsr.ko: ${ARECASRC}
 	rm -rf ${ARECADIR}
@@ -275,6 +274,6 @@
 
 .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} ${ARECADIR} arcmsr.ko
+	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} ${ARECADIR} arcmsr.ko ${BNX2DIR} bnx2.ko cnic.ko
 
 

Modified: pve-kernel-2.6.32-rh/trunk/README
===================================================================
--- pve-kernel-2.6.32-rh/trunk/README	2011-08-31 05:24:31 UTC (rev 6521)
+++ pve-kernel-2.6.32-rh/trunk/README	2011-08-31 05:33:21 UTC (rev 6522)
@@ -23,6 +23,15 @@
 
   * ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/DRIVER/SourceCode/arcmsr.1.20.0X.15-110330.zip
 
+- include latest broadcom bnx2 drivers
+        
+  * original file linux-6.2.23.zip contains
+    netxtreme2-6.2.23.tar.gz (added to repository)
+
+  NOTE: we do not install the bnx2x driver, because it does not compile
+  with recent kernels
+
+
 FIRMWARE:
 =========
 

Modified: pve-kernel-2.6.32-rh/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-08-31 05:24:31 UTC (rev 6521)
+++ pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-08-31 05:33:21 UTC (rev 6522)
@@ -1,6 +1,10 @@
 pve-kernel-2.6.32 (2.6.32-38) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab035.1.src.rpm
+  
+  * update e1000e to 1.5.1
+  
+  * include latest bnx2 drivers
 
  -- Proxmox Support Team <support at proxmox.com>  Wed, 31 Aug 2011 07:23:57 +0200
 

Deleted: pve-kernel-2.6.32-rh/trunk/e1000e-1.3.17.tar.gz
===================================================================
(Binary files differ)

Added: pve-kernel-2.6.32-rh/trunk/e1000e-1.5.1.tar.gz
===================================================================
(Binary files differ)


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



More information about the pve-devel mailing list