-RELEASE=3.1
+RELEASE=3.2
KERNEL_VER=2.6.32
-PKGREL=118
+PKGREL=130
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=27
+KREL=30
-RHKVER=358.23.2.el6
-OVZVER=042stab084.14
+RHKVER=431.17.1.el6
+OVZVER=042stab090.5
KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
AOEDIR=aoe6-77
AOESRC=${AOEDIR}.tar.gz
-E1000EDIR=e1000e-2.5.4
+E1000EDIR=e1000e-3.0.4.1
E1000ESRC=${E1000EDIR}.tar.gz
-IGBDIR=igb-5.0.6
+IGBDIR=igb-5.1.2
IGBSRC=${IGBDIR}.tar.gz
-IXGBEDIR=ixgbe-3.18.7
+IXGBEDIR=ixgbe-3.19.1
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
dpkg-deb --build proxmox-ve/data ${PVE_DEB}
check_gcc:
- gcc --version|grep "4.7.2" || false
+ gcc --version|grep "4\.7\.2" || false
${DST_DEB}: data control.in postinst.in
mkdir -p data/DEBIAN
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-042stab084
+ cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab090
+ 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
- cd ${KERNEL_SRC}; patch -p1 <../kvm-fix-invalid-secondary-exec-controls.patch
+ #cd ${KERNEL_SRC}; patch -p1 <../kvm-fix-invalid-secondary-exec-controls.patch
#cd ${KERNEL_SRC}; patch -p1 <../0001-bridge-disable-querier.patch
#cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-disable-querier.patch
#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
+ # this enable querier by default
+ 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 <../fix-aspm-policy.patch
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
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}