SPECS (Titanium): kernel-desktop.spec - add grsec-minimal as bcond

[shadzik]

Author: shadzik                      Date: Sun Mar 29 20:28:10 2009 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- add grsec-minimal as bcond

---- Files affected:
SPECS:
   kernel-desktop.spec (1.204.2.24 -> 1.204.2.25) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.204.2.24 SPECS/kernel-desktop.spec:1.204.2.25
--- SPECS/kernel-desktop.spec:1.204.2.24	Wed Mar 25 13:26:23 2009
+++ SPECS/kernel-desktop.spec	Sun Mar 29 22:28:04 2009
@@ -33,6 +33,7 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	laptop		# build for laptops - 100Hz
+%bcond_without	grsec_minimal	# build wihout grsec_minimal
 
 %{?debug:%define with_verbose 1}
 
@@ -48,9 +49,9 @@
 %define		_enable_debug_packages			0
 
 %if %{with laptop}
-%define		alt_kernel	laptop%{?with_pae:-pae}
+%define		alt_kernel	laptop%{?with_pae:-pae}%{?without_grsec_minimal:-nogrsec}
 %else
-%define		alt_kernel	desktop%{?with_pae:-pae}
+%define		alt_kernel	desktop%{?with_pae:-pae}%{?without_grsec_minimal:-nogrsec}
 %endif
 
 # kernel release (used in filesystem and eventually in uname -r)
@@ -83,6 +84,7 @@
 
 Source10:	kernel-desktop-x86.config
 Source11:	kernel-desktop-x86_64.config
+Source12:	kernel-desktop-grsec_minimal.config
 
 #### Patches ######
 Source100:	http://www.tuxonice.net/downloads/all/current-tuxonice-for-head.patch-20090313-v1.bz2
@@ -91,6 +93,7 @@
 # http://download.filesystems.org/unionfs/stable/unionfs-2.5.1_for_2.6.27.10.diff.gz
 Patch1:		kernel-desktop-unionfs.patch
 Patch2:		kernel-desktop-wfdp_export.patch
+Patch3:		kernel-desktop-grsec-minimal.patch
 
 #### End patches ##
 URL:		http://www.kernel.org/
@@ -423,6 +426,10 @@
 %patch2 -p0
 # TuxOnIce
 %{__bzip2} -dc %{SOURCE100} | patch -p1 -s
+# grsec-minimal
+%if %{with grsec_minimal}
+%patch3 -p1
+%endif
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
@@ -493,6 +500,9 @@
 %__sed -i "s:CONFIG_HZ=1000:CONFIG_HZ=100:" %{defconfig}
 %endif
 
+%if %{with grsec_minimal}
+cat %{SOURCE12} >> %{defconfig}
+%endif
 }
 
 BuildKernel() {
@@ -999,6 +1009,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.25  2009/03/29 20:28:04  shadzik
+- add grsec-minimal as bcond
+
 Revision 1.204.2.24  2009/03/25 12:26:23  vip
 - move some headers/files to module-build and headers so external modules can be build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.204.2.24&r2=1.204.2.25&f=u