packages (LINUX_2_6_35): kernel/kernel.spec - vanilla: set alt_kernel to va...

[sparky]

Author: sparky                       Date: Sun May  1 15:11:18 2011 GMT
Module: packages                      Tag: LINUX_2_6_35
---- Log message:
- vanilla: set alt_kernel to vanilla (unless myown is set)

---- Files affected:
packages/kernel:
   kernel.spec (1.837.2.11 -> 1.837.2.12) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.837.2.11 packages/kernel/kernel.spec:1.837.2.12
--- packages/kernel/kernel.spec:1.837.2.11	Sun May  1 16:46:59 2011
+++ packages/kernel/kernel.spec	Sun May  1 17:11:13 2011
@@ -130,16 +130,20 @@
 %if "%{_alt_kernel}" == ""
 %define		alt_kernel	myown
 %endif
-%else
-%if %{without rescuecd}
+%else # not myown:
+%if %{with vanilla}
+%define		alt_kernel	vanilla
+%else # not vanilla:
+%if %{with rescuecd}
+%define		alt_kernel	rescuecd
+%else # not rescuecd:
 %define		__alt_kernel	%{?with_pax:pax}%{!?with_grsec_full:nogrsecurity}%{!?with_apparmor:noaa}%{?with_pae:pae}
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
 %endif
-%else
-%define		alt_kernel	rescuecd
-%endif
-%endif
+%endif # not rescuecd
+%endif # not vanilla
+%endif # not myown
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -1603,6 +1607,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.12  2011/05/01 15:11:13  sparky
+- vanilla: set alt_kernel to vanilla (unless myown is set)
+
 Revision 1.837.2.11  2011/05/01 14:46:59  sparky
 - vanilla: make sure grsecurity bcond is disabled, because it affects %files
 
================================================================

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