update to kernel-3.10.0-327.3.1.el7.src.rpm

[pve-kernel-3.10.0.git] / Makefile

diff --git a/Makefile b/Makefile
index 67d404189eab94a36a45e0cd40382878ec308739..28dd754b660b763759f6b786f5aa7d64393c292e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 RELEASE=3.4
 
 KERNEL_VER=3.10.0
-PKGREL=33
+PKGREL=40
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=9
+KREL=15
 
-RHKVER=229.1.2.el7
+RHKVER=327.3.1.el7
 
 KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
 
@@ -33,13 +33,13 @@ FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 E1000EDIR=e1000e-3.1.0.2
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.2.15
+IGBDIR=igb-5.2.18
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-3.23.2
+IXGBEDIR=ixgbe-4.0.3
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-I40EDIR=i40e-1.2.37
+I40EDIR=i40e-1.2.38
 I40ESRC=${I40EDIR}.tar.gz
 
 BNX2DIR=netxtreme2-7.11.05
@@ -68,18 +68,15 @@ ARECASRC=${ARECADIR}.zip
 #ISCSITARGETDIR=iscsitarget-1.4.20.2
 #ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
 
-ZFSVER=0.6.4.1
-SPLDIR=spl-${ZFSVER}
-SPLSRC=spl-${ZFSVER}.tar.gz
-ZFSDIR=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
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
-PVEPKG=proxmox-ve-${KERNEL_VER}
-PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
 
 all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB}
 
@@ -87,7 +84,8 @@ all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB}
 download:
        rm -f ${KERNELSRCRPM}
        #wget http://vault.centos.org/7.0.1406/os/Source/SPackages/${KERNELSRCRPM}
-       wget http://vault.centos.org/7.0.1406/updates/Source/SPackages/${KERNELSRCRPM}
+       #wget http://vault.centos.org/7.0.1406/updates/Source/SPackages/${KERNELSRCRPM}
+       wget http://vault.centos.org/7.1.1503/updates/Source/SPackages/${KERNELSRCRPM}
 
 check_gcc: 
 ifeq    ($(CC), cc)
@@ -179,6 +177,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        #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 <../kvmstealtime.patch
        #cd ${KERNEL_SRC}; patch -p1 <../kvm-fix-invalid-secondary-exec-controls.patch
        #cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
        #cd ${KERNEL_SRC}; patch -p1 <../kbuild-generate-mudules-builtin.patch
@@ -186,8 +185,11 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        #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 <../add-empty-ndo_poll_controller-to-veth.patch
-       cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
+       # cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
        cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch
+       cp ${KERNEL_SRC}/drivers/vhost/scsi.c ${KERNEL_SRC}/drivers/vhost/scsi.c.backup 
+       # vhost-scsi compile fixes
+       cd ${KERNEL_SRC}; patch -p1 <../vhost-scsi-fixes.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@