update netxtreme2 drivers to version 7.11.05

[pve-kernel-2.6.32.git] / Makefile

diff --git a/Makefile b/Makefile
index b9816a0b7d65727cecb86e8051dc937237f8ca66..915920f89d404d48a1a42c0793fd440368fa1c9f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
-RELEASE=3.2
+RELEASE=3.3
 
 KERNEL_VER=2.6.32
-PKGREL=126
+PKGREL=141
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=29
+KREL=35
 
-RHKVER=431.11.2.el6
-OVZVER=042stab088.4
+RHKVER=431.29.2.el6
+OVZVER=042stab094.8
 
 KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
 
@@ -29,26 +29,26 @@ KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
 AOEDIR=aoe6-77
 AOESRC=${AOEDIR}.tar.gz
 
-E1000EDIR=e1000e-3.0.4.1
+E1000EDIR=e1000e-3.1.0.2
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.1.2
+IGBDIR=igb-5.2.9.4
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-3.19.1
+IXGBEDIR=ixgbe-3.21.2
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-BNX2DIR=netxtreme2-7.8.56
+BNX2DIR=netxtreme2-7.11.05
 BNX2SRC=${BNX2DIR}.tar.gz
 
-AACRAIDVER=1.2.1-40300
+AACRAIDVER=1.2.1-40700
 AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
 AACRAIDDIR=aacraid
 
-MEGARAID_DIR=megaraid_sas-06.602.03.00
+MEGARAID_DIR=megaraid_sas-06.703.11.00
 MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
 
-ARECADIR=arcmsr-1.30.0X.16-20131206
+ARECADIR=arcmsr-1.30.0X.19-140509
 ARECASRC=${ARECADIR}.zip
 
 RR272XSRC=RR272x_1x-Linux-Src-v1.5-130325-0732.tar.gz
@@ -57,6 +57,9 @@ RR272XDIR=rr272x_1x-linux-src-v1.5
 ISCSITARGETDIR=iscsitarget-1.4.20.2
 ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
 
+OVSDIR=openvswitch-2.3.0
+OVSSRC=${OVSDIR}.tar.gz
+
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 PVEPKG=proxmox-ve-${KERNEL_VER}
@@ -78,14 +81,20 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
        gzip --best proxmox-ve/data/usr/share/doc/${PVEPKG}/changelog.Debian
        dpkg-deb --build proxmox-ve/data ${PVE_DEB}
 
-check_gcc: 
-       gcc --version|grep "4\.4\.7" || false
+check_gcc:
+ifeq ($(CC), cc)
+       gcc --version|grep "4\.7\.2" || false
+else
+       $(CC) --version|grep "4\.7" || false
+endif
 
-${DST_DEB}: data control.in postinst.in
+${DST_DEB}: data control.in postinst.in postrm.in
        mkdir -p data/DEBIAN
        sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' <control.in >data/DEBIAN/control
        sed -e 's/@@KVNAME@@/${KVNAME}/g'  <postinst.in >data/DEBIAN/postinst
        chmod 0755 data/DEBIAN/postinst
+       sed -e 's/@@KVNAME@@/${KVNAME}/g'  <postrm.in >data/DEBIAN/postrm
+       chmod 0755 data/DEBIAN/postrm
        install -D -m 644 copyright data/usr/share/doc/${PACKAGE}/copyright
        install -D -m 644 changelog.Debian data/usr/share/doc/${PACKAGE}/changelog.Debian
        echo "git clone git://git.proxmox.com/git/pve-kernel-2.6.32.git\\ngit checkout ${GITVERSION}" > data/usr/share/doc/${PACKAGE}/SOURCE
@@ -101,13 +110,15 @@ fwlist-${KVNAME} fwtest: data
        cmp fwlist.tmp fwlist-2.6.32-20-pve
        mv fwlist.tmp $@
 
-data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko
+data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko openvswitch.ko
        rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
        mkdir tmp/boot
        install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
        install -m 644 ${KERNEL_SRC}/System.map tmp/boot/System.map-${KVNAME}
        install -m 644 ${KERNEL_SRC}/arch/x86_64/boot/bzImage tmp/boot/vmlinuz-${KVNAME}
        cd ${KERNEL_SRC}; make INSTALL_MOD_PATH=../tmp/ modules_install
+       # install OVS driver
+       install -m 644 openvswitch.ko tmp/lib/modules/${KVNAME}/kernel/net/openvswitch/openvswitch.ko
        # install latest aoe driver
        install -m 644 aoe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/aoe/aoe.ko
        # install latest ixgbe driver
@@ -153,8 +164,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        rm -rf ${KERNEL_SRC}
        cp -a ${KERNEL_SRC}.org ${KERNEL_SRC}
        cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31-rh.patch
-       cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab088
-       cd ${KERNEL_SRC}; patch -p1 <../cpt-drop-DCACHE_NFSFS_RENAMED-for-all-NFS-dentries-on-kill.patch
+       cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab094
        cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../kvm-fix-invalid-secondary-exec-controls.patch
@@ -171,6 +181,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../add-tiocgdev-ioctl.patch
        #cd ${KERNEL_SRC}; patch -p1 <../fix-nfs-block-count.patch
        cd ${KERNEL_SRC}; patch -p1 <../fix-idr-header-for-drbd-compilation.patch
+       cd ${KERNEL_SRC}; patch -p1 <../kvm-x86-ignore-ioapic-polarity.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -205,11 +216,13 @@ megaraid_sas.ko: .compile_mark ${MEGARAID_SRC}
 aacraid.ko: .compile_mark ${AACRAIDSRC}
        rm -rf ${AACRAIDDIR}
        mkdir ${AACRAIDDIR}
-       cd ${AACRAIDDIR};tar xzf ../${AACRAIDSRC}       
+       cd ${AACRAIDDIR};tar xzf ../${AACRAIDSRC}
+       cd ${AACRAIDDIR};rpm2cpio aacraid-${AACRAIDVER}.src.rpm|cpio -i
+       cd ${AACRAIDDIR};tar xf aacraid_source.tgz
        mkdir -p /lib/modules/${KVNAME}
        ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR}/aacraid-${AACRAIDVER}.src/aacraid_source modules
-       cp ${AACRAIDDIR}/aacraid-${AACRAIDVER}.src/aacraid_source/aacraid.ko .
+       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} modules
+       cp ${AACRAIDDIR}/aacraid.ko .
 
 aoe.ko aoe: .compile_mark ${AOESRC}
        # aoe driver updates
@@ -247,7 +260,6 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
 bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
        rm -rf ${BNX2DIR}
        tar xf ${BNX2SRC}
-       cd ${BNX2DIR}; patch -p1 <../fix-netxtreme2-compile-error.patch
        mkdir -p /lib/modules/${KVNAME}
        ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
        cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME}
@@ -262,6 +274,17 @@ arcmsr.ko: .compile_mark ${ARECASRC}
        cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules
        cp ${ARECADIR}/arcmsr.ko arcmsr.ko
 
+openvswitch.ko: .compile_mark ${OVSSRC}
+       rm -rf ${OVSDIR}
+       tar xf ${OVSSRC}
+       mkdir -p /lib/modules/${KVNAME}
+       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+       cd ${OVSDIR}; ln -s ../ovspatches/ patches; quilt push -a
+       cd ${OVSDIR}; ./boot.sh
+       cd ${OVSDIR}; ./configure --with-linux=${TOP}/${KERNEL_SRC}
+       cd ${OVSDIR}; make -C datapath/linux
+       cp ${OVSDIR}/datapath/linux/openvswitch.ko openvswitch.ko
+
 iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
        rm -rf ${ISCSITARGETDIR}
        tar xf ${ISCSITARGETSRC}
@@ -314,7 +337,7 @@ 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} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} megaraid_sas.ko ${MEGARAID_DIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR}
+       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 aacraid.ko ${AACRAIDDIR} megaraid_sas.ko ${MEGARAID_DIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${OVSDIR} openvswitch.ko