[packages/kernel/LINUX_3_4] - clean up alt_kernel setting

baggins baggins at pld-linux.org
Mon Sep 24 16:31:42 CEST 2012


commit 55fc090f6f33e763994991ce5099e56fb4f59f89
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 24 16:31:27 2012 +0200

    - clean up alt_kernel setting

 kernel.spec | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 1ea6007..81bba61 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -96,11 +96,6 @@
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
 # alt_kernel should be defined if __alt_kernel has non-empty value (for %{?alt_kernel:foo} constructs)
-%define		__alt_kernel	%{?with_pax:pax}%{?with_grsecurity:grsecurity}
-
-%if "%{__alt_kernel}" != ""
-%define		alt_kernel	%{__alt_kernel}
-%endif
 
 # these override whatever name was picked from bconds
 %if %{with myown}
@@ -114,7 +109,7 @@
 %if %{with rescuecd}
 %define		alt_kernel	rescuecd
 %else # not rescuecd:
-%define		__alt_kernel	longterm
+%define		__alt_kernel	longterm%{?with_pax:pax}%{?with_grsecurity:grsecurity}
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/55fc090f6f33e763994991ce5099e56fb4f59f89



More information about the pld-cvs-commit mailing list