Author: pluto Date: Wed Oct 12 22:39:13 2005 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- preempt patching fixed, grsecurity disabled by default 'til fix arrives.
- release 0.6.
---- Files affected:
SPECS:
kernel.spec (1.441.2.1248 -> 1.441.2.1249)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1248 SPECS/kernel.spec:1.441.2.1249
--- SPECS/kernel.spec:1.441.2.1248 Wed Oct 12 22:52:14 2005
+++ SPECS/kernel.spec Thu Oct 13 00:39:07 2005
@@ -34,7 +34,7 @@
%bcond_without up # don't build UP kernel
%bcond_without source # don't build kernel-source package
%bcond_without pcmcia # don't build pcmcia
-%bcond_without grsecurity # disable grsecurity
+%bcond_with grsecurity # enable grsecurity
%bcond_without pld_vers # disable pld-specific UTS_NAME changes
%bcond_with grsec_basic # enable basic grsecurity functionality
(proc,link,fifo)
# bcond only valid "without grsecurity"
@@ -130,7 +130,7 @@
%define _oprofile_ver 0.5.3
%define _udev_ver 058
-%define _rel 0.5
+%define _rel 0.6
%define _netfilter_snap 20050915
@@ -145,7 +145,7 @@
Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems)
Summary(fr): Le Kernel-Linux (La partie centrale du systeme)
Summary(pl): Jądro Linuksa
-Name:
kernel%{?with_grsecurity:-grsecurity}%{?with_omosix:-openmosix}%{?with_vserver:-vserver}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
+Name:
kernel%{?with_grsecurity:-grsecurity}%{?with_omosix:-openmosix}%{?with_vserver:-vserver}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_preemptive:-preempt}
#define _postver .2
%define _postver %{nil}
Version: 2.6.14%{_postver}
@@ -162,9 +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
-
+# derived from
http://people.redhat.com/mingo/realtime-preempt/patch-2.6.14-rc4-rt1
+Source4: patch-2.6.14-rc4-rt1
Source5: kernel-ppclibs.Makefile
Source20: kernel-i386.config
@@ -723,10 +722,7 @@
%prep
%setup -q -n linux-%{version}%{_rc}
bzip2 -d -c %{SOURCE3} | patch -p1 -s
-%if %{with preemptive}
-patch -p1 -s < %{SOURCE4}
-sed -i 's:SPIN_LOCK_UNLOCKED:SPIN_LOCK_UNLOCKED(SendCmplPktQ.QueueLock):'
drivers/net/sk98lin/sky2.c
-%endif
+%{?with_preemptive:patch -p1 -s < %{SOURCE4}}
install %{SOURCE5} Makefile.ppclibs
%patch0 -p1
@@ -807,6 +803,7 @@
%patch80 -p1
%patch82 -p1
+%{?with_preemptive:sed -i
's:SPIN_LOCK_UNLOCKED:SPIN_LOCK_UNLOCKED(SendCmplPktQ.QueueLock):'
drivers/net/sk98lin/sky2.c}
%patch83 -p1
%patch84 -p1
%patch86 -p1
@@ -1678,6 +1675,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1249 2005/10/12 22:39:07 pluto
+- preempt patching fixed, grsecurity disabled by default 'til fix arrives.
+- release 0.6.
+
Revision 1.441.2.1248 2005/10/12 20:52:14 pluto
- Realtime-LSM added.
(it's a loadable extension for linux kernels. it selectively grants
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1248&r2=1.441.2.1249&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
