- rel 2; this kernel supports vserver now

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 493cd110c824293624f0eba888eee9499737b0a4..a820a477d162004a2c965ff75156464f4d13085d 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@
 %bcond_without esfq            # esfq support
 %bcond_without ipv6            # ipv6 support
 
-%bcond_with    vserver         # support for VServer
+%bcond_without vserver         # support for VServer
 
 %bcond_with    rt              # real-time kernel (CONFIG_PREEMPT_RT) for low latencies
 
@@ -70,9 +70,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
+%define                rel             2
 %define                basever         4.4
-%define                postver         .100
+%define                postver         .111
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -124,7 +124,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  4eccf20e90bf366c041cdf99f6c3370d
+# Patch0-md5:  d23387c591d45b0472bef1488bb4e949
 %endif
 Source1:       kernel.sysconfig
 
@@ -192,8 +192,8 @@ Patch59:    kernel-rndis_host-wm5.patch
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:       kernel-hostap.patch
 
-%define        vserver_patch 3.18.5-vs2.3.7.3
-# http://vserver.13thfloor.at/Experimental/patch-3.18.5-vs2.3.7.3.diff
+%define        vserver_patch 4.4.111-vs2.3.9.5
+# http://vserver.13thfloor.at/Experimental/patch-4.4.111-vs2.3.9.5.diff
 # note there are additional patches from above url:
 # - *fix* are real fixes (we want these)
 # - *feat* are new features/tests (we don't want these)
@@ -316,7 +316,7 @@ Conflicts:  reiserfsprogs < 3.6.3
 Conflicts:     rpm < 4.4.2-0.2
 Conflicts:     udev < 1:081
 Conflicts:     util-linux < 2.10o
-Conflicts:     util-vserver < 0.30.216
+Conflicts:     util-vserver < 0.30.216-1.pre3126.3
 Conflicts:     xfsprogs < 2.6.0
 %if %{without pae}
 ExclusiveArch: i686 pentium3 pentium4 athlon