update to vzkernel-2.6.32-042stab078.22.src.rpm

[pve-kernel-2.6.32.git] / Makefile

diff --git a/Makefile b/Makefile
index 8aa342fd7644eb745daaa8e3782c81bd8452ffd1..06c02f132ba5ffce155c096a2e2bba8ca619926d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
-RELEASE=2.3
+RELEASE=3.0
 
 KERNEL_VER=2.6.32
-PKGREL=89
+PKGREL=103
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=19
+KREL=21
 
-RHKVER=279.22.1.el6
-OVZVER=042stab074.10
+RHKVER=358.6.2.el6
+OVZVER=042stab078.22
 
 KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
 
@@ -25,19 +25,19 @@ KERNEL_CFG=config-${KERNEL_VER}
 KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
 
 FW_VER=1.0
-FW_REL=21
+FW_REL=23
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 AOEDIR=aoe6-77
 AOESRC=${AOEDIR}.tar.gz
 
-E1000EDIR=e1000e-2.2.14
+E1000EDIR=e1000e-2.3.2
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-4.1.2
+IGBDIR=igb-4.2.16
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-3.12.6
+IXGBEDIR=ixgbe-3.14.5
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 BNX2DIR=netxtreme2-7.4.27
@@ -73,7 +73,7 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
        dpkg-deb --build proxmox-ve/data ${PVE_DEB}
 
 check_gcc: 
-       gcc --version|grep "4.4.5" || false
+       gcc --version|grep "4.7.2" || false
 
 ${DST_DEB}: data control.in postinst.in
        mkdir -p data/DEBIAN
@@ -141,11 +141,20 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        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-042stab074
+       cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab078
        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 <../0001-bridge-disable-querier.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-disable-querier.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0003-bridge-disable-querier.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0004-bridge-disable-querier.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0005-bridge-disable-querier.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0001-bridge-only-expire-the-mdb-entry-when-query-is-recei.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-send-query-as-soon-as-leave-is-received.patch
        cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
-       #cd ${KERNEL_SRC}; patch -p1 <../optimize-cfq-parameters.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-ipoib-add-missing-lock.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -256,7 +265,7 @@ ${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in
 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 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-5-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-15-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE 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-5-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-15-pve fwlist-2.6.32-20-pve fwlist-${KVNAME}
        rm -rf fwdata
        mkdir -p fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
@@ -272,6 +281,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE changelog.firmware fwli
        ./assemble-firmware.pl fwlist-2.6.32-14-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-2.6.32-15-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-2.6.32-16-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-2.6.32-20-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