- rel 2; this kernel supports vserver again

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 06552a392a2c47871425636cb3aba4e6ef5cd2c5..78d0b1fb05ad060065a8d5ccd5b4cb31b6519712 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -31,7 +31,7 @@
 
 %bcond_without aufs            # aufs4 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
 
@@ -71,9 +71,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
+%define                rel             2
 %define                basever         4.9
-%define                postver         .63
+%define                postver         .76
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -125,7 +125,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 0a68ef3615c64bd5ee54a3320e46667d
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  b33a9986522e03675c10528339687bf0
+# Patch0-md5:  3cb57f9904fdd7a1e277ad76e70c9a3c
 %endif
 Source1:       kernel.sysconfig
 
@@ -187,8 +187,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.9.76-vs2.3.9.5
+# http://vserver.13thfloor.at/Experimental/patch-4.9.76-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)
@@ -213,7 +213,7 @@ Patch146:   kernel-aufs4+vserver.patch
 Patch250:      kernel-fix_256colors_menuconfig.patch
 
 # https://rt.wiki.kernel.org/
-# https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.27-rt18.patch.xz
+# http://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.68-rt60.patch.xz
 Patch500:      kernel-rt.patch
 
 Patch2000:     kernel-small_fixes.patch
@@ -309,7 +309,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