-RELEASE=3.2
+RELEASE=3.4
KERNEL_VER=2.6.32
-PKGREL=133
+PKGREL=162
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=31
+KREL=41
-RHKVER=431.20.3.el6
-OVZVER=042stab092.3
+RHKVER=504.30.3.el6
+OVZVER=042stab111.11
KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
AOEDIR=aoe6-77
AOESRC=${AOEDIR}.tar.gz
-E1000EDIR=e1000e-3.0.4.1
+E1000EDIR=e1000e-3.1.0.2
E1000ESRC=${E1000EDIR}.tar.gz
-IGBDIR=igb-5.1.2
+IGBDIR=igb-5.2.18
IGBSRC=${IGBDIR}.tar.gz
-IXGBEDIR=ixgbe-3.19.1
+IXGBEDIR=ixgbe-4.0.3
IXGBESRC=${IXGBEDIR}.tar.gz
-BNX2DIR=netxtreme2-7.8.56
+I40EDIR=i40e-1.2.38
+I40ESRC=${I40EDIR}.tar.gz
+
+BNX2DIR=netxtreme2-7.11.05
BNX2SRC=${BNX2DIR}.tar.gz
-AACRAIDVER=1.2.1-40300
+AACRAIDVER=1.2.1-40700
AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
AACRAIDDIR=aacraid
-MEGARAID_DIR=megaraid_sas-06.602.03.00
+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
-ARECADIR=arcmsr-1.30.0X.16-20131206
+ARECADIR=arcmsr-1.30.0X.19-140509
ARECASRC=${ARECADIR}.zip
RR272XSRC=RR272x_1x-Linux-Src-v1.5-130325-0732.tar.gz
ISCSITARGETDIR=iscsitarget-1.4.20.2
ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
+OVSDIR=openvswitch-2.3.2
+OVSSRC=${OVSDIR}.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
+
DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
PVEPKG=proxmox-ve-${KERNEL_VER}
$(CC) --version|grep "4\.7" || false
endif
-${DST_DEB}: data control.in postinst.in postrm.in
+${DST_DEB}: data control.in postinst.in prerm.in postrm.in
mkdir -p data/DEBIAN
sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' <control.in >data/DEBIAN/control
sed -e 's/@@KVNAME@@/${KVNAME}/g' <postinst.in >data/DEBIAN/postinst
chmod 0755 data/DEBIAN/postinst
+ sed -e 's/@@KVNAME@@/${KVNAME}/g' <prerm.in >data/DEBIAN/prerm
+ chmod 0755 data/DEBIAN/prerm
sed -e 's/@@KVNAME@@/${KVNAME}/g' <postrm.in >data/DEBIAN/postrm
chmod 0755 data/DEBIAN/postrm
install -D -m 644 copyright data/usr/share/doc/${PACKAGE}/copyright
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
+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 ${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 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
install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
# install iscsitarget module
install -m 644 -D iscsi_trgt.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/iscsi_trgt.ko
+ # install zfs drivers
+ install -d -m 0755 tmp/lib/modules/${KVNAME}/zfs
+ install -m 644 ${SPL_MODULES} ${ZFS_MODULES} tmp/lib/modules/${KVNAME}/zfs
# remove firmware
rm -rf tmp/lib/firmware
# strip debug info
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-042stab092
+ cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab111
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 <../add-tiocgdev-ioctl.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 $@
aacraid.ko: .compile_mark ${AACRAIDSRC}
rm -rf ${AACRAIDDIR}
mkdir ${AACRAIDDIR}
- cd ${AACRAIDDIR};tar xzf ../${AACRAIDSRC}
+ cd ${AACRAIDDIR};tar xzf ../${AACRAIDSRC}
+ cd ${AACRAIDDIR};rpm2cpio aacraid-${AACRAIDVER}.src.rpm|cpio -i
+ cd ${AACRAIDDIR};tar xf aacraid_source.tgz
+ 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 .
+
+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}/${AACRAIDDIR}/aacraid-${AACRAIDVER}.src/aacraid_source modules
- cp ${AACRAIDDIR}/aacraid-${AACRAIDVER}.src/aacraid_source/aacraid.ko .
+ 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
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}
- 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}
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
+
+${SPL_MODULES}: .compile_mark ${SPLSRC}
+ rm -rf ${SPLDIR}
+ tar xf ${SPLSRC}
+ cd ${SPLDIR}; ./autogen.sh
+ cd ${SPLDIR}; ./configure --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
+ cd ${SPLDIR}; make
+ cp ${SPLDIR}/module/spl/spl.ko spl.ko
+ cp ${SPLDIR}/module/splat/splat.ko splat.ko
+
+${ZFS_MODULES}: .compile_mark ${SPL_MODULES} ${ZFSSRC}
+ rm -rf ${ZFSDIR}
+ tar xf ${ZFSSRC}
+ cd ${ZFSDIR}; ./autogen.sh
+ cd ${ZFSDIR}; ./configure --with-spl=${TOP}/${SPLDIR} --with-spl-obj=${TOP}/${SPLDIR} --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
+ cd ${ZFSDIR}; make
+ cp ${ZFSDIR}/module/zfs/zfs.ko zfs.ko
+ cp ${ZFSDIR}/module/avl/zavl.ko zavl.ko
+ cp ${ZFSDIR}/module/nvpair/znvpair.ko znvpair.ko
+ cp ${ZFSDIR}/module/unicode/zunicode.ko zunicode.ko
+ cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
+ cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
+
iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
rm -rf ${ISCSITARGETDIR}
tar xf ${ISCSITARGETSRC}
.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}
+ 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}