packages: kernel/kernel.spec - simplify alt_kernel name picking logic

[glen]

Author: glen                         Date: Tue Oct 25 15:35:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplify alt_kernel name picking logic

---- Files affected:
packages/kernel:
   kernel.spec (1.990 -> 1.991) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.990 packages/kernel/kernel.spec:1.991
--- packages/kernel/kernel.spec:1.990	Mon Oct 24 21:46:31 2011
+++ packages/kernel/kernel.spec	Tue Oct 25 17:35:04 2011
@@ -103,24 +103,21 @@
 
 %define		module_init_tools_ver	3.16
 
-%if %{with myown}
-%if "%{_alt_kernel}" == ""
+%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}
+%if "%{__alt_kernel}" != ""
+	%define		alt_kernel	%{__alt_kernel}
+%endif
+
+# these override whatever name was picked from bconds
+%if %{with myown} && "%{_alt_kernel}" == ""
 %define		alt_kernel	myown
 %endif
-%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_grsecurity:nogrsecurity}%{?with_pae:pae}
-%if "%{__alt_kernel}" != ""
-%define		alt_kernel	%{__alt_kernel}
 %endif
-%endif # not rescuecd
-%endif # not vanilla
-%endif # not myown
+%if %{with vanilla}
+%define		alt_kernel	vanilla
+%else
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -1534,6 +1531,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.991  2011/10/25 15:35:04  glen
+- simplify alt_kernel name picking logic
+
 Revision 1.990  2011/10/24 19:46:31  arekm
 - update unionfs to unionfs-2.5.10_for_3.1.0-rc4.diff.gz
 
================================================================

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