RELEASE=3.4
KERNEL_VER=2.6.32
-PKGREL=178
+PKGREL=180
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
KREL=47
RHKVER=642.el6
-OVZVER=042stab117.14
+OVZVER=042stab117.16
KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
BNX2DIR=netxtreme2-7.14.05
BNX2SRC=${BNX2DIR}.tar.gz
-AACRAIDVER=1.2.1-41024
+AACRAIDVER=1.2.1-50667
AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
AACRAIDDIR=aacraid
-HPSAVER=3.4.6
+HPSAVER=3.4.16
HPSADIR=hpsa-${HPSAVER}
-HPSASRC=${HPSADIR}-170.tar.bz2
+HPSASRC=${HPSADIR}-145.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.2
-OVSSRC=${OVSDIR}.tar.gz
+#OVSDIR=openvswitch-2.3.2
+#OVSSRC=${OVSDIR}.tar.gz
SPLDIR=pkg-spl
SPLSRC=pkg-spl.tar.gz
cmp fwlist.tmp fwlist-2.6.32-20-pve
mv fwlist.tmp $@
-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}
+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 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 ${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 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 i40e driver
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
+ cd ${KERNEL_SRC}; patch -p1 <../CVE-2016-5195.patch
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
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
+#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
${SPL_MODULES}: .compile_mark ${SPLSRC}
rm -rf ${SPLDIR}
.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 ${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}
+ 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} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR}