update to vzkernel-2.6.32-042stab062.2.src.rpm

[pve-kernel-2.6.32.git] / Makefile

diff --git a/Makefile b/Makefile
index 49a0553dbb0053be9d6d53acade226ac5cb4482d..e0dca30849ec9d82da89985e9f54eadecf87cb13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 RELEASE=2.2
 
 KERNEL_VER=2.6.32
-PKGREL=78
+PKGREL=79
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=15
+KREL=16
 
-RHKVER=279.5.1.el6
-OVZVER=042stab061.9
+RHKVER=279.9.1.el6
+OVZVER=042stab062.2
 
 KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
 
@@ -25,7 +25,7 @@ KERNEL_CFG=config-${KERNEL_VER}
 KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
 
 FW_VER=1.0
-FW_REL=19
+FW_REL=20
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 AOEDIR=aoe6-77
@@ -129,7 +129,7 @@ ${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-042stab061
+       cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab062
        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 <../fix-aspm-policy.patch
@@ -225,7 +225,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-${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-${KVNAME}
        rm -rf fwdata
        mkdir -p fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
@@ -238,6 +238,8 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE changelog.firmware fwli
        ./assemble-firmware.pl fwlist-2.6.32-6-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-2.6.35-1-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-2.6.32-13-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-2.6.32-14-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-2.6.32-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