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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-12-03 06:19:46 +0100 (Fri, 03 Dec 2010)
New Revision: 5325

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-12-01 05:22:09 UTC (rev 5324)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-12-03 05:19:46 UTC (rev 5325)
@@ -1,7 +1,7 @@
 RELEASE=1.7
 
 KERNEL_VER=2.6.32
-PKGREL=28
+PKGREL=29
 KREL=4
 
 KERNEL_DEB_REL=28
@@ -25,6 +25,9 @@
 AOEDIR=aoe6-73
 AOESRC=${AOEDIR}.tar.gz
 
+E1000EDIR=e1000e-1.2.20
+E1000ESRC=${E1000EDIR}.tar.gz
+
 IGBDIR=igb-2.4.8
 IGBSRC=${IGBDIR}.tar.gz
 
@@ -80,7 +83,7 @@
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-data: .compile_mark config-${KERNEL_VER} aoe.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi-scst.ko scst-modules.tar
+data: .compile_mark config-${KERNEL_VER} aoe.ko e1000e.ko igb.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}
@@ -93,6 +96,8 @@
 	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 latest e1000e driver
+	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
@@ -151,6 +156,14 @@
 	cd ${AOEDIR}; make KVER=${KVNAME}
 	cp ${AOEDIR}/linux/drivers/block/aoe/aoe.ko aoe.ko
 
+e1000e.ko e1000e: ${E1000ESRC}
+	rm -rf ${E1000EDIR}
+	tar xf ${E1000ESRC}
+	mkdir -p /lib/modules/${KVNAME}
+	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+	cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME}
+	cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
+
 igb.ko igb: ${IGBSRC}
 	rm -rf ${IGBDIR}
 	tar xf ${IGBSRC}
@@ -272,6 +285,6 @@
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data proxmox-ve/data *.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 iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${IGBDIR} igb.ko ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko fwlist-${KVNAME}
+	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data proxmox-ve/data *.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 iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${E1000E} e1000e.ko ${IGBDIR} igb.ko ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko fwlist-${KVNAME}
 
 

Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README	2010-12-01 05:22:09 UTC (rev 5324)
+++ pve-kernel-2.6.32/trunk/README	2010-12-03 05:19:46 UTC (rev 5325)
@@ -21,6 +21,8 @@
 
 - include latest igb driver from intel/sourceforge
 
+- include latest e1000e driver from intel/sourceforge
+
 - include latest broadcom bnx2 drivers
         
         * original file linux-5.2.55.zip contains

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-12-01 05:22:09 UTC (rev 5324)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-12-03 05:19:46 UTC (rev 5325)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-29) unstable; urgency=low
+
+  * udpate e1000e driver to 1.2.20
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 03 Dec 2010 06:15:13 +0100
+
 pve-kernel-2.6.32 (2.6.32-28) unstable; urgency=low
 
   * upgarde to debian squeeze kernel 2.6.32-28 (openvz 2.6.32-dzhanibekov)