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 18cd032b2202ea356a5eb9f8400b25c84131205d..28dd754b660b763759f6b786f5aa7d64393c292e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 RELEASE=3.4
 
 KERNEL_VER=3.10.0
-PKGREL=37
+PKGREL=40
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=12
+KREL=15
 
-RHKVER=229.14.1.el7
+RHKVER=327.3.1.el7
 
 KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
 
@@ -77,8 +77,6 @@ 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}
 
@@ -86,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)
@@ -178,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
@@ -185,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 $@