Author: pluto Date: Wed Oct 12 14:11:54 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - preemptive (realtime) kernel.
---- Files affected: SPECS: kernel.spec (1.441.2.1245 -> 1.441.2.1246) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1245 SPECS/kernel.spec:1.441.2.1246 --- SPECS/kernel.spec:1.441.2.1245 Wed Oct 12 14:27:19 2005 +++ SPECS/kernel.spec Wed Oct 12 16:11:48 2005 @@ -42,7 +42,7 @@ %bcond_with omosix # enable openMosix (conflicts with grsecurity/vserver) %bcond_with vserver # enable vserver (conflicts with grsecurity/omosix) %bcond_with verbose # verbose build (V=1) -%bcond_with preemptive # build preemptive kernel +%bcond_with preemptive # build preemptive (realtime) kernel %bcond_with regparm # (ix86) use register arguments (this break binary-only modules) %bcond_with em8300 # DXR3/Hollywood %bcond_with xen0 # build Xen0 kernel @@ -162,6 +162,8 @@ Source2: kernel-config.h Source3: http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-%{version}%{_rc}-git1.bz2 # Source3-md5: 782d23f524f50d2d3ad3df707384ef20 +Source4: http://people.redhat.com/mingo/realtime-preempt/patch-2.6.14-rc4-rt1 +# Source4-md5: 6c3693a2d3a4a16dfac2996043a24dd7 Source5: kernel-ppclibs.Makefile @@ -191,12 +193,14 @@ Source50: kernel.FAQ-pl Source80: kernel-netfilter.config + Source90: kernel-grsec.config Source91: kernel-grsec+pax.config Source92: kernel-omosix.config Source93: kernel-vserver.config Source94: kernel-em8300.config Source95: kernel-linuxabi.config +Source96: kernel-rt.config Patch0: 2.6.0-ksyms-add.patch Patch1: linux-2.6-version.patch @@ -718,6 +722,7 @@ %prep %setup -q -n linux-%{version}%{_rc} bzip2 -d -c %{SOURCE3} | patch -p1 -s +%{?with_preemptive:patch -p1 -s < %{SOURCE4}} install %{SOURCE5} Makefile.ppclibs %patch0 -p1 @@ -964,12 +969,6 @@ cat $RPM_SOURCE_DIR/kernel-$Config.config > arch/%{_target_base_arch}/defconfig TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig -%if %{with preemptive} - sed -i 's:CONFIG_PREEMPT_NONE=y:# CONFIG_PREEMPT_NONE is not set:' arch/%{_target_base_arch}/defconfig - sed -i 's:# CONFIG_PREEMPT is not set:CONFIG_PREEMPT=y:' arch/%{_target_base_arch}/defconfig - sed -i 's:# CONFIG_PREEMPT_BKL is not set:CONFIG_PREEMPT_BKL=y:' arch/%{_target_base_arch}/defconfig -%endif - cat %{SOURCE80} >> arch/%{_target_base_arch}/defconfig %if %{with grsecurity} @@ -993,6 +992,9 @@ %if %{with em8300} cat %{SOURCE94} >> arch/%{_target_base_arch}/defconfig %endif +%if %{with preemptive} + cat %{SOURCE96} >> arch/%{_target_base_arch}/defconfig +%endif ln -sf arch/%{_target_base_arch}/defconfig .config install -d $KERNEL_INSTALL_DIR/usr/src/linux-%{version}/include/linux @@ -1671,6 +1673,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.441.2.1246 2005/10/12 14:11:48 pluto +- preemptive (realtime) kernel. + Revision 1.441.2.1245 2005/10/12 12:27:19 pluto - patch-2.6.14rc4-git1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1245&r2=1.441.2.1246&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
