update to vzkernel-2.6.32-042stab088.4.src.rpm

[pve-kernel-2.6.32.git] / Makefile

diff --git a/Makefile b/Makefile
index 488e0b4899e2dd7ea3e8230619c4b8c7b6430aaa..b9816a0b7d65727cecb86e8051dc937237f8ca66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 RELEASE=3.2
 
 KERNEL_VER=2.6.32
-PKGREL=123
+PKGREL=126
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=28
+KREL=29
 
-RHKVER=431.1.2.el6
-OVZVER=042stab085.17
+RHKVER=431.11.2.el6
+OVZVER=042stab088.4
 
 KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
 
@@ -41,10 +41,11 @@ IXGBESRC=${IXGBEDIR}.tar.gz
 BNX2DIR=netxtreme2-7.8.56
 BNX2SRC=${BNX2DIR}.tar.gz
 
-AACRAIDSRC=aacraid-1.2.1-30300.src.rpm
-AACRAIDDIR=aacraid-1.2.1
+AACRAIDVER=1.2.1-40300
+AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
+AACRAIDDIR=aacraid
 
-MEGARAID_DIR=megaraid_sas-06.601.06.00
+MEGARAID_DIR=megaraid_sas-06.602.03.00
 MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
 
 ARECADIR=arcmsr-1.30.0X.16-20131206
@@ -78,7 +79,7 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
        dpkg-deb --build proxmox-ve/data ${PVE_DEB}
 
 check_gcc: 
-       gcc --version|grep "4.4.7" || false
+       gcc --version|grep "4\.4\.7" || false
 
 ${DST_DEB}: data control.in postinst.in
        mkdir -p data/DEBIAN
@@ -152,7 +153,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-042stab085
+       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 <../do-not-use-barrier-on-ext3.patch
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
@@ -204,12 +205,11 @@ megaraid_sas.ko: .compile_mark ${MEGARAID_SRC}
 aacraid.ko: .compile_mark ${AACRAIDSRC}
        rm -rf ${AACRAIDDIR}
        mkdir ${AACRAIDDIR}
-       cd ${AACRAIDDIR};rpm2cpio ../${AACRAIDSRC} |cpio -i
-       cd ${AACRAIDDIR};tar xzf aacraid_source.tgz     
+       cd ${AACRAIDDIR};tar xzf ../${AACRAIDSRC}       
        mkdir -p /lib/modules/${KVNAME}
        ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} modules
-       cp ${AACRAIDDIR}/aacraid.ko .
+       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR}/aacraid-${AACRAIDVER}.src/aacraid_source modules
+       cp ${AACRAIDDIR}/aacraid-${AACRAIDVER}.src/aacraid_source/aacraid.ko .
 
 aoe.ko aoe: .compile_mark ${AOESRC}
        # aoe driver updates