SPECS: kernel-desktop.spec - builds with grsec_minimal: rel 0.3 (p...

sparky sparky at pld-linux.org
Wed Jun 21 19:53:04 CEST 2006


Author: sparky                       Date: Wed Jun 21 17:53:04 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds with grsec_minimal: rel 0.3 (ppc still broken)
- added with laptop bcond

---- Files affected:
SPECS:
   kernel-desktop.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.25 SPECS/kernel-desktop.spec:1.26
--- SPECS/kernel-desktop.spec:1.25	Wed Jun 21 16:19:00 2006
+++ SPECS/kernel-desktop.spec	Wed Jun 21 19:52:59 2006
@@ -8,8 +8,9 @@
 
 %bcond_without	preemptrt	# don't build preemptive kernel
 %bcond_without	suspend2	# don't build software suspend support
-%bcond_with	verbose		# verbose build (V=1)
 %bcond_without	grsec_minimal	# don't build grsecurity (minimal subset: proc,link,fifo,shm)
+%bcond_with	laptop		# build with HZ=100
+%bcond_with	verbose		# verbose build (V=1)
 %bcond_with	test_build	# don't patch with preemptrt nor any patch depending no it
 
 %{?debug:%define with_verbose 1}
@@ -49,7 +50,6 @@
 %define		_oprofile_ver		0.9
 %define		_udev_ver		071
 
-%define		_rel			0.2
 
 %define		_netfilter_snap		20060504
 %define		_nf_hipac_ver		0.9.1
@@ -75,7 +75,7 @@
 Name:		kernel-%{_alt_kernel}
 %define		_basever	2.6.17
 %define		_postver	.1
-#define		_postver	%{nil}
+%define		_rel		0.3
 Version:	%{_basever}%{_postver}
 Release:	%{_rel}
 Epoch:		0
@@ -798,6 +798,13 @@
 	cat %{SOURCE46} >> arch/%{_target_base_arch}/defconfig
 %endif
 
+%if %{with laptop}
+	sed -e "s:CONFIG_HZ_1000=y:# CONFIG_HZ_1000 is not set:"	\
+		-e "s:# CONFIG_HZ_100 is not set:CONFIG_HZ_100=y:"	\
+		-e "s:CONFIG_HZ=1000:CONFIG_HZ=100:"			\
+		-i arch/%{_target_base_arch}/defconfig
+%endif
+
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" arch/%{_target_base_arch}/defconfig}
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" arch/%{_target_base_arch}/defconfig}
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{_target_base_arch}/defconfig}
@@ -1375,6 +1382,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/06/21 17:52:59  sparky
+- builds with grsec_minimal: rel 0.3 (ppc still broken)
+- added with laptop bcond
+
 Revision 1.25  2006/06/21 14:19:00  sparky
 - up to 2.6.17.1, using patch, there is only 1 line changged !
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-desktop.spec?r1=1.25&r2=1.26&f=u



More information about the pld-cvs-commit mailing list