add fix for jfs compilation

[pve-kernel-2.6.32.git] / Makefile

diff --git a/Makefile b/Makefile
index 0c349fad899f336c9c579dd261a8e51cb708c280..ba443b843a3899813bd9165e8f2f96352e666ad1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 RELEASE=3.4
 
 KERNEL_VER=2.6.32
-PKGREL=156
+PKGREL=158
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=39
+KREL=40
 
-RHKVER=504.16.2.el6
-OVZVER=042stab108.1
+RHKVER=504.23.4.el6
+OVZVER=042stab110.1
 
 KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
 
@@ -64,7 +64,7 @@ RR272XDIR=rr272x_1x-linux-src-v1.5
 ISCSITARGETDIR=iscsitarget-1.4.20.2
 ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
 
-OVSDIR=openvswitch-2.3.1
+OVSDIR=openvswitch-2.3.2
 OVSSRC=${OVSDIR}.tar.gz
 
 ZFSVER=0.6.4.1
@@ -188,7 +188,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-042stab108
+       cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab110
        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
@@ -207,6 +207,7 @@ ${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 <../kvm-x86-ignore-ioapic-polarity.patch
+       cd ${KERNEL_SRC}; patch -p1 <../fix-jfs-compile-error.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@