add vserver patch info to package description

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index b05aa0785fbb2b8e48da82ac375df34d0b3fc0d8..882b2430b0dddde889f3200fb725501d79448db4 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,9 +68,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
-%define                basever         3.15
-%define                postver         .4
+%define                rel             2
+%define                basever         3.16
+%define                postver         .2
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -113,10 +113,10 @@ Epoch:            3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
-# Source0-md5: 97ca1625bb40368dc41b9a7971549071
+# Source0-md5: 5c569ed649a0c9711879f333e90c5386
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  c0ecbe6a65913273c3338be7218dcf58
+# Patch0-md5:  926e6e2ee0634ce53730701da749b040
 %endif
 Source1:       kernel.sysconfig
 
@@ -184,6 +184,7 @@ 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.10.9-vs2.3.6.6
 # http://vserver.13thfloor.at/Experimental/patch-3.13.6-vs2.3.6.11.diff
 # note there are additional patches from above url:
 # - *fix* are real fixes (we want these)
@@ -225,15 +226,14 @@ Patch250: kernel-fix_256colors_menuconfig.patch
 Patch400:      kernel-virtio-gl-accel.patch
 
 # http://people.redhat.com/mpatocka/patches/kernel/dm-crypt-paralelizace/current/series.html
-Patch500:      dm-crypt-remove-percpu.patch
-Patch501:      bio-kmalloc-align.patch
-Patch502:      dm-crypt-per_bio_data.patch
-Patch503:      dm-crypt-unbound-workqueue.patch
-Patch504:      dm-crypt-dont-allocate-partial-pages.patch
-Patch505:      dm-crypt-fix-allocation-deadlock.patch
-Patch506:      dm-crypt-remove-io-pool.patch
-Patch507:      dm-crypt-offload-writes-to-thread.patch
-Patch508:      dm-crypt-sort-requests.patch
+Patch500:      bio-kmalloc-align.patch
+Patch501:      dm-crypt-per_bio_data.patch
+Patch502:      dm-crypt-unbound-workqueue.patch
+Patch503:      dm-crypt-dont-allocate-partial-pages.patch
+Patch504:      dm-crypt-fix-allocation-deadlock.patch
+Patch505:      dm-crypt-remove-io-pool.patch
+Patch506:      dm-crypt-offload-writes-to-thread.patch
+Patch507:      dm-crypt-sort-requests.patch
 
 Patch2000:     kernel-small_fixes.patch
 Patch2001:     kernel-pwc-uncompress.patch
@@ -398,6 +398,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %{!?with_vserver:WARNING: VSERVER IS DISABLED IN THIS KERNEL BUILD!}\
 %{?with_fbcondecor:Fbsplash/fbcondecor - enabled }\
 %{?with_nfsroot:Root on NFS - enabled}\
+%{?with_vserver:Linux-VServer - %{vserver_patch}}\
 
 %define Features %(echo "%{__features}" | sed '/^$/d')
 
@@ -743,7 +744,6 @@ cd linux-%{basever}
 %patch505 -p1
 %patch506 -p1
 %patch507 -p1
-%patch508 -p1
 %endif
 
 %endif # vanilla
@@ -1454,6 +1454,7 @@ fi
 %{_kernelsrcdir}/scripts/module-common.lds
 %attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
 %{_kernelsrcdir}/scripts/*.c
+%{_kernelsrcdir}/scripts/*.h
 %attr(755,root,root) %{_kernelsrcdir}/scripts/*.sh
 %{_kernelsrcdir}/scripts/selinux/genheaders/*.c
 %{_kernelsrcdir}/scripts/selinux/mdp/*.c
@@ -1524,6 +1525,7 @@ fi
 %exclude %{_kernelsrcdir}/scripts/module-common.lds
 %exclude %{_kernelsrcdir}/scripts/setlocalversion
 %exclude %{_kernelsrcdir}/scripts/*.c
+%exclude %{_kernelsrcdir}/scripts/*.h
 %exclude %{_kernelsrcdir}/scripts/*.sh
 %exclude %dir %{_kernelsrcdir}/scripts/selinux
 %exclude %{_kernelsrcdir}/scripts/selinux/Makefile