update to vzkernel-2.6.32-042stab079.5.src.rpm

[pve-kernel-2.6.32.git] / Makefile

diff --git a/Makefile b/Makefile
index e624b80e1db94a188eb8ee617117618201c8cc4c..6712f243391f4caf783945d646c5e6250f8c82e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 RELEASE=3.0
 
 KERNEL_VER=2.6.32
-PKGREL=102
+PKGREL=109
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=21
+KREL=23
 
-RHKVER=358.6.2.el6
-OVZVER=042stab078.16
+RHKVER=358.14.1.el6
+OVZVER=042stab079.5
 
 KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
 
@@ -31,21 +31,24 @@ FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 AOEDIR=aoe6-77
 AOESRC=${AOEDIR}.tar.gz
 
-E1000EDIR=e1000e-2.3.2
+E1000EDIR=e1000e-2.4.14
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-4.2.16
+IGBDIR=igb-4.3.0
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-3.14.5
+IXGBEDIR=ixgbe-3.16.1
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 BNX2DIR=netxtreme2-7.4.27
 BNX2SRC=${BNX2DIR}.tar.gz
 
-AACRAIDSRC=aacraid-1.2.1-29900.src.rpm
+AACRAIDSRC=aacraid-1.2.1-30200.src.rpm
 AACRAIDDIR=aacraid-1.2.1
 
+MEGARAID_DIR=megaraid_sas-06.600.18.00
+MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
+
 #ARECADIR=arcmsr.1.20.0X.15-110330
 #ARECASRC=${ARECADIR}.zip
 
@@ -93,7 +96,7 @@ fwlist-${KVNAME}: data
        ./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
        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
+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
        rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
        mkdir tmp/boot
        install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
@@ -114,6 +117,8 @@ data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.
        install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/bnx2x/
        # install aacraid drivers
        install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
+       # install megaraid_sas driver
+       install -m 644 megaraid_sas.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/megaraid/
        # install areca driver
        #install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
        # install iscsitarget module
@@ -141,7 +146,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-042stab078
+       cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab079
        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 <../0001-bridge-disable-querier.patch
@@ -149,12 +154,11 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../0003-bridge-disable-querier.patch
        cd ${KERNEL_SRC}; patch -p1 <../0004-bridge-disable-querier.patch
        cd ${KERNEL_SRC}; patch -p1 <../0005-bridge-disable-querier.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0001-bridge-only-expire-the-mdb-entry-when-query-is-recei.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-send-query-as-soon-as-leave-is-received.patch
+       #cd ${KERNEL_SRC}; patch -p1 <../0001-bridge-only-expire-the-mdb-entry-when-query-is-recei.patch
+       #cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-send-query-as-soon-as-leave-is-received.patch
        cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
        cd ${KERNEL_SRC}; patch -p1 <../kbuild-generate-mudules-builtin.patch
        cd ${KERNEL_SRC}; patch -p1 <../add-tiocgdev-ioctl.patch
-       cd ${KERNEL_SRC}; patch -p1 <../fix-ipoib-add-missing-lock.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -170,6 +174,14 @@ ${RHKERSRCDIR}/kernel.spec: ${KERNELSRCRPM}
        cd ${RHKERSRCDIR};rpm2cpio ../${KERNELSRCRPM} |cpio -i
        touch $@
 
+megaraid_sas.ko: .compile_mark ${MEGARAID_SRC}
+       rm -rf ${MEGARAID_DIR}
+       tar xf ${MEGARAID_SRC}
+       mkdir -p /lib/modules/${KVNAME}
+       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${MEGARAID_DIR} modules
+       cp ${MEGARAID_DIR}/megaraid_sas.ko .
+
 aacraid.ko: .compile_mark ${AACRAIDSRC}
        rm -rf ${AACRAIDDIR}
        mkdir ${AACRAIDDIR}
@@ -312,7 +324,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}
+       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}