update to kernel-3.10.0-514.el7.src.rpm, bump api to 22-pve

[pve-kernel-3.10.0.git] / Makefile

diff --git a/Makefile b/Makefile
index 995af584b2f9c1ea91ce03073876fda35461db9b..8401dd7df397605eca0890a9cb80f4a5402902b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 RELEASE=3.4
 
 KERNEL_VER=3.10.0
-PKGREL=41
+PKGREL=51
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=15
+KREL=22
 
-RHKVER=327.3.1.el7
+RHKVER=514.el7
 
 KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
 
@@ -27,19 +27,19 @@ KERNEL_CFG=config-${KERNEL_VER}
 KERNEL_CFG_ORG=${RHKERSRCDIR}/kernel-${KERNEL_VER}-x86_64.config
 
 FW_VER=1.1
-FW_REL=5
+FW_REL=6
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
-E1000EDIR=e1000e-3.3.1
+E1000EDIR=e1000e-3.3.5.3
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.3.3.5
+IGBDIR=igb-5.3.5.4
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-4.2.3
+IXGBEDIR=ixgbe-4.5.4
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-I40EDIR=i40e-1.3.49
+I40EDIR=i40e-1.5.25
 I40ESRC=${I40EDIR}.tar.gz
 
 # does not compile with RHEL 7.2 (=327.3.1.el7)
@@ -51,9 +51,9 @@ AACRAIDVER=1.2.1-40700
 AACRAIDDIR=aacraid-${AACRAIDVER}.src
 AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
 
-HPSAVER=3.4.6
+HPSAVER=3.4.16
 HPSADIR=hpsa-${HPSAVER}
-HPSASRC=${HPSADIR}-170.tar.bz2
+HPSASRC=${HPSADIR}-145.tar.bz2
 
 # driver does not compile
 #MEGARAID_DIR=megaraid_sas-06.703.11.00
@@ -87,7 +87,7 @@ 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.1.1503/updates/Source/SPackages/${KERNELSRCRPM}
+       wget http://vault.centos.org/7.2.1511/updates/Source/SPackages/${KERNELSRCRPM}
 
 check_gcc: 
 ifeq    ($(CC), cc)
@@ -180,19 +180,19 @@ ${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
        #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 <../add-empty-ndo_poll_controller-to-veth.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 <../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
+       # nbd compile fix
+       cd ${KERNEL_SRC}; patch -p1 <../nbd-rename-REQ_TYPE_SPECIAL.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -347,7 +347,7 @@ dvb-firmware.git/README:
 linux-firmware.git/WHENCE:
        git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git linux-firmware.git
 
-${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-20-pve fwlist-2.6.32-21-pve fwlist-3.10.0-3-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-20-pve fwlist-2.6.32-21-pve fwlist-3.10.0-3-pve fwlist-3.10.0-15-pve fwlist-${KVNAME}
        rm -rf fwdata
        mkdir -p fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
@@ -363,6 +363,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README
        ./assemble-firmware.pl fwlist-2.6.32-20-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-2.6.32-21-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-3.10.0-3-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-3.10.0-15-pve fwdata/lib/firmware
        install -d fwdata/usr/share/doc/pve-firmware
        cp linux-firmware.git/WHENCE fwdata/usr/share/doc/pve-firmware/README
        install -d fwdata/usr/share/doc/pve-firmware/licenses
@@ -376,16 +377,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README
 
 .PHONY: upload
 upload: ${DST_DEB} ${HDR_DEB} ${FW_DEB}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       mkdir -p /pve/${RELEASE}/install
-       rm -rf /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-       rm -rf /pve/${RELEASE}/extra/${HDRPACKAGE}_*.deb
-       rm -rf /pve/${RELEASE}/extra/pve-firmware*.deb
-       rm -rf /pve/${RELEASE}/extra/Packages*
-       cp ${DST_DEB} ${FW_DEB} ${HDR_DEB} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+       tar -cf - ${DST_DEB} ${HDR_DEB} ${FW_DEB} | ssh repoman@repo.proxmox.com upload --dist wheezy
 
 .PHONY: distclean
 distclean: clean