packages (Titanium): kernel-bare-vserver/kernel-bare-vserver.spec - started...

[hawk]

Author: hawk                         Date: Fri Oct 16 14:43:37 2009 GMT
Module: packages                      Tag: Titanium
---- Log message:
- started work on 2.6.31.x

---- Files affected:
packages/kernel-bare-vserver:
   kernel-bare-vserver.spec (1.1.2.94 -> 1.1.2.95) 

---- Diffs:

================================================================
Index: packages/kernel-bare-vserver/kernel-bare-vserver.spec
diff -u packages/kernel-bare-vserver/kernel-bare-vserver.spec:1.1.2.94 packages/kernel-bare-vserver/kernel-bare-vserver.spec:1.1.2.95
--- packages/kernel-bare-vserver/kernel-bare-vserver.spec:1.1.2.94	Thu Sep 24 22:03:43 2009
+++ packages/kernel-bare-vserver/kernel-bare-vserver.spec	Fri Oct 16 16:43:31 2009
@@ -13,9 +13,9 @@
 %define		have_sound	1
 %define		have_isa	1
 
-%define		_basever		2.6.27
-%define		_postver		.35
-%define		_rel			1
+%define		_basever		2.6.31
+%define		_postver		.4
+%define		_rel			0.1
 
 %define		_enable_debug_packages			0
 
@@ -39,10 +39,10 @@
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
-# Source0-md5:	b3e78977aa79d3754cb7f8143d7ddabd
+# Source0-md5:	84c077a37684e4cbfa67b18154390d8a
 %if "%{_postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	6d49b54ff6ed54896db5d9e2ab7a6c0c
+# Source1-md5:	02078f4231baee4f0004212f2875df2b
 %endif
 
 Source2:	kernel-bare-vserver-autoconf.h
@@ -56,8 +56,6 @@
 Patch100:	linux-2.6-vs2.3.patch
 # minimal grsecurity for vserver patched kernel
 Patch101:	linux-2.6-grsec-vs-minimal.patch
-# from squashfs: http://dl.sourceforge.net/sourceforge/squashfs/squashfs3.4.tar.gz
-Patch102:	linux-2.6.27-squashfs.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.18
@@ -373,7 +371,6 @@
 
 %patch100 -p1
 %patch101 -p1
-%patch102 -p1
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
@@ -699,7 +696,7 @@
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/g_midi.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/legacy/ide-cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/b43
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/hostap/hostap_cs.ko*
@@ -727,14 +724,14 @@
 %if %{with pcmcia}
 %files pcmcia
 %defattr(644,root,root,755)
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
 /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/*ko*
 /lib/modules/%{kernel_release}/kernel/drivers/*/pcmcia
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/ide/legacy/ide-cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/b43
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/hostap/hostap_cs.ko*
@@ -770,6 +767,12 @@
 %defattr(644,root,root,755)
 %dir %{_kernelsrcdir}
 %{_kernelsrcdir}/include
+%dir %{_kernelsrcdir}/arch
+%dir %{_kernelsrcdir}/arch/[!K]*
+%{_kernelsrcdir}/arch/*/include
+%dir %{_kernelsrcdir}/security
+%dir %{_kernelsrcdir}/security/selinux
+%{_kernelsrcdir}/security/selinux/include
 %{_kernelsrcdir}/config-dist
 %{_kernelsrcdir}/Module.symvers-dist
 
@@ -796,6 +799,11 @@
 %{_kernelsrcdir}/scripts/*.sh
 %{_kernelsrcdir}/scripts/kconfig/*
 %{_kernelsrcdir}/scripts/mkcompile_h
+%dir %{_kernelsrcdir}/scripts/selinux
+%{_kernelsrcdir}/scripts/selinux/Makefile
+%dir %{_kernelsrcdir}/scripts/selinux/mdp
+%{_kernelsrcdir}/scripts/selinux/mdp/Makefile
+%{_kernelsrcdir}/scripts/selinux/mdp/*.c
 
 %files doc
 %defattr(644,root,root,755)
@@ -840,6 +848,7 @@
 %exclude %{_kernelsrcdir}/scripts/*.sh
 %{_kernelsrcdir}/sound
 %{_kernelsrcdir}/security
+%{_kernelsrcdir}/tools
 %{_kernelsrcdir}/usr
 %{_kernelsrcdir}/virt
 %{_kernelsrcdir}/COPYING
@@ -856,6 +865,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.95  2009/10/16 14:43:31  hawk
+- started work on 2.6.31.x
+
 Revision 1.1.2.94  2009/09/24 20:03:43  hawk
 - updated to 2.6.27.35
 - killed firmware subpackage (merged into main package)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-bare-vserver/kernel-bare-vserver.spec?r1=1.1.2.94&r2=1.1.2.95&f=u