-RELEASE=3.3
+RELEASE=3.4
KERNEL_VER=2.6.32
-PKGREL=144
+PKGREL=176
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=35
+KREL=46
-RHKVER=504.1.3.el6
-OVZVER=042stab102.9
+RHKVER=573.26.1.el6
+OVZVER=042stab116.1
KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
AOEDIR=aoe6-77
AOESRC=${AOEDIR}.tar.gz
-E1000EDIR=e1000e-3.1.0.2
+E1000EDIR=e1000e-3.2.4.2
E1000ESRC=${E1000EDIR}.tar.gz
-IGBDIR=igb-5.2.15
+IGBDIR=igb-5.3.3.2
IGBSRC=${IGBDIR}.tar.gz
-IXGBEDIR=ixgbe-3.23.2
+IXGBEDIR=ixgbe-4.1.5
IXGBESRC=${IXGBEDIR}.tar.gz
+I40EDIR=i40e-1.3.46
+I40ESRC=${I40EDIR}.tar.gz
+
BNX2DIR=netxtreme2-7.11.05
BNX2SRC=${BNX2DIR}.tar.gz
-AACRAIDVER=1.2.1-40700
+AACRAIDVER=1.2.1-41024
AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
AACRAIDDIR=aacraid
+HPSAVER=3.4.6
+HPSADIR=hpsa-${HPSAVER}
+HPSASRC=${HPSADIR}-170.tar.bz2
+
MEGARAID_DIR=megaraid_sas-06.703.11.00
MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
ISCSITARGETDIR=iscsitarget-1.4.20.2
ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
-OVSDIR=openvswitch-2.3.1
+OVSDIR=openvswitch-2.3.2
OVSSRC=${OVSDIR}.tar.gz
-ZFSVER=0.6.3-1.2
-SPLDIR=spl-spl-${ZFSVER}
-SPLSRC=spl-${ZFSVER}.tar.gz
-ZFSDIR=zfs-zfs-${ZFSVER}
-ZFSSRC=zfs-${ZFSVER}.tar.gz
+SPLDIR=pkg-spl
+SPLSRC=pkg-spl.tar.gz
+ZFSDIR=pkg-zfs
+ZFSSRC=pkg-zfs.tar.gz
ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
SPL_MODULES=spl.ko splat.ko
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 openvswitch.ko ${SPL_MODULES} ${ZFS_MODULES}
+data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko i40e.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko openvswitch.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES}
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 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 i40e driver
+ install -m 644 i40e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/i40e/
# install latest ixgbe driver
install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ixgbe/
# install latest e1000e driver
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 hpsa driver
+ install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/
# install megaraid_sas driver
install -m 644 megaraid_sas.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/megaraid/
# install Highpoint 2710 RAID driver
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-042stab102
+ cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab116
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 <../bridge-forward-ipv6-neighbor-solicitation.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 <../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
+ cd ${KERNEL_SRC}; patch -p1 <../fix-jfs-compile-error.patch
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} modules
cp ${AACRAIDDIR}/aacraid.ko .
+hpsa.ko hpsa: .compile_mark ${HPSASRC}
+ rm -rf ${HPSADIR}
+ tar xf ${HPSASRC}
+ cd ${HPSADIR}; patch -p1 <../hpsa-config-fix.patch
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${HPSADIR}/drivers/scsi modules
+ cp ${HPSADIR}/drivers/scsi/hpsa.ko hpsa.ko
+
aoe.ko aoe: .compile_mark ${AOESRC}
# aoe driver updates
rm -rf ${AOEDIR} aoe.ko
cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
+i40e.ko i40e: .compile_mark ${I40ESRC}
+ rm -rf ${I40EDIR}
+ tar xf ${I40ESRC}
+ mkdir -p /lib/modules/${KVNAME}
+ ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+ cd ${I40EDIR}/src; make BUILD_KERNEL=${KVNAME}
+ cp ${I40EDIR}/src/i40e.ko i40e.ko
+
bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
rm -rf ${BNX2DIR}
tar xf ${BNX2SRC}
.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} ${OVSDIR} openvswitch.ko ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES}
+ rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${I40EDIR} ${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 ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR}
projects / pve-kernel-2.6.32.git / blobdiff