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

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Sep 17 14:00:30 CEST 2010


Author: dietmar
Date: 2010-09-17 12:00:30 +0000 (Fri, 17 Sep 2010)
New Revision: 5172

Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/README
   pve-kernel-2.6.32/trunk/changelog.Debian
   pve-kernel-2.6.32/trunk/changelog.firmware
   pve-kernel-2.6.32/trunk/fwlist-2.6.32-3-pve
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-09-17 10:32:11 UTC (rev 5171)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-09-17 12:00:30 UTC (rev 5172)
@@ -3,7 +3,7 @@
 KERNEL_VER=2.6.32
 KERNEL_DEB_REL=22
 
-PKGREL=15
+PKGREL=16
 KREL=3
 
 EXTRAVERSION=-${KREL}-pve
@@ -19,7 +19,7 @@
 KERNEL_DEB_DIFF=linux-2.6_${KERNEL_VER}-${KERNEL_DEB_REL}.diff.gz
 
 FW_VER=1.0
-FW_REL=7
+FW_REL=8
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 BUSYBOXVER=1.14.0
@@ -29,6 +29,9 @@
 AOEDIR=aoe6-73
 AOESRC=${AOEDIR}.tar.gz
 
+IXGBEDIR=ixgbe-2.1.4
+IXGBESRC=${IXGBEDIR}.tar.gz
+
 SCSTDIR=scst
 SCSTSRC=scst-snap-21.12.09.tgz
 ISCSIDIR=iscsi-scst
@@ -76,7 +79,7 @@
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-data: .compile_mark config-${KERNEL_VER} aoe.ko iscsi-scst.ko scst-modules.tar
+data: .compile_mark config-${KERNEL_VER} aoe.ko ixgbe.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}
@@ -87,6 +90,8 @@
 	#install -m 644 -D drbd.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/drbd/drbd.ko
 	# install latest aoe driver
 	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 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
@@ -137,6 +142,15 @@
 	cd ${AOEDIR}; make KVER=${KVNAME}
 	cp ${AOEDIR}/linux/drivers/block/aoe/aoe.ko aoe.ko
 
+ixgbe.ko ixgbe: ${IXGBESRC}
+	rm -rf ${IXGBEDIR}
+	tar xf ${IXGBESRC}
+	mkdir -p /lib/modules/${KVNAME}
+	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+	cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
+	cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
+
+
 scst-src/AskingQuestions:
 	#svn co https://scst.svn.sourceforge.net/svnroot/scst/trunk scst-src
 	tar xf ${SCSTSRC}
@@ -256,6 +270,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_*
+	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}
 
 

Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README	2010-09-17 10:32:11 UTC (rev 5171)
+++ pve-kernel-2.6.32/trunk/README	2010-09-17 12:00:30 UTC (rev 5172)
@@ -17,6 +17,8 @@
 
 - include latest AoE driver (http://support.coraid.com/support/linux)
 
+- include latest ixgbe deriver from intel/sourceforge
+
 FIRMWARE:
 =========
 

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-09-17 10:32:11 UTC (rev 5171)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-09-17 12:00:30 UTC (rev 5172)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-16) unstable; urgency=low
+
+  * include latest ixgbe driver
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 17 Sep 2010 13:58:44 +0200
+
 pve-kernel-2.6.32 (2.6.32-15) unstable; urgency=low
 
   * update to debian kernel 2.6.32-22

Modified: pve-kernel-2.6.32/trunk/changelog.firmware
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.firmware	2010-09-17 10:32:11 UTC (rev 5171)
+++ pve-kernel-2.6.32/trunk/changelog.firmware	2010-09-17 12:00:30 UTC (rev 5172)
@@ -1,3 +1,9 @@
+pve-firmware (1.0-8) unstable; urgency=low
+
+  * include phanfw.bin (netxen_nic.ko)
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 17 Sep 2010 13:00:54 +0200
+
 pve-firmware (1.0-7) unstable; urgency=low
 
   * carefully install all needed files by querying modinfo

Modified: pve-kernel-2.6.32/trunk/fwlist-2.6.32-3-pve
===================================================================
--- pve-kernel-2.6.32/trunk/fwlist-2.6.32-3-pve	2010-09-17 10:32:11 UTC (rev 5171)
+++ pve-kernel-2.6.32/trunk/fwlist-2.6.32-3-pve	2010-09-17 12:00:30 UTC (rev 5172)
@@ -328,8 +328,6 @@
 tehuti/firmware.bin kernel/drivers/net/tehuti.ko
 bnx2x-e1h-5.0.21.0.fw kernel/drivers/net/bnx2x.ko
 bnx2x-e1-5.0.21.0.fw kernel/drivers/net/bnx2x.ko
-rtl8168d-2.fw kernel/drivers/net/r8169.ko
-rtl8168d-1.fw kernel/drivers/net/r8169.ko
 kaweth/trigger_code_fix.bin kernel/drivers/net/usb/kaweth.ko
 kaweth/trigger_code.bin kernel/drivers/net/usb/kaweth.ko
 kaweth/new_code_fix.bin kernel/drivers/net/usb/kaweth.ko
@@ -337,6 +335,7 @@
 i2400m-fw-sdio-1.3.sbcf kernel/drivers/net/wimax/i2400m/i2400m-sdio.ko
 i2400m-fw-usb-1.3.sbcf kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
 i2400m-fw-usb-1.4.sbcf kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
+phanfw.bin kernel/drivers/net/netxen/netxen_nic.ko
 nx3fwmn.bin kernel/drivers/net/netxen/netxen_nic.ko
 nx3fwct.bin kernel/drivers/net/netxen/netxen_nic.ko
 nxromimg.bin kernel/drivers/net/netxen/netxen_nic.ko



More information about the pve-devel mailing list