- rel 1; works for me on x86_64

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 83243d890d06fc6eed05494b3ea66830574e74f8..addcb36eb1fa6168c7af7adda7dfbeb6c3d51def 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,8 +69,8 @@
 %endif
 
 %define                rel             1
-%define                basever         3.15
-%define                postver         .6
+%define                basever         3.17
+%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: fb30d0f29214d75cddd2faa94f73d5cf
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  25e4c27b4aff5e14dc4b3dc0029fd05d
+# Patch0-md5:  d694b8625f834791f5e02d7c9add1406
 %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
@@ -1304,7 +1304,7 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/g_midi.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko*
 %endif
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
@@ -1394,7 +1394,7 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/sound/oss
 %endif
 %ifnarch sparc
-/lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/g_midi.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/media/pci/cx88/cx88-alsa.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/media/usb/em28xx/em28xx-alsa.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/media/pci/saa7134/saa7134-alsa.ko*
@@ -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