Author: baggins Date: Fri May 5 13:19:51 2006 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- removed bconds: preemptive, suspend2, vserver
now these features are enabled unconditionally, preempt as built in
CONFIG_PREEMPT_VOLUNTARY and CONFIG_PREEMPT_BKL
Rationale: These features are non-intrusive and have no noticable impact
on kernel performance, thus having them on bconds is unnecessary
complicating build process.
---- Files affected:
SPECS:
kernel.spec (1.441.2.1521 -> 1.441.2.1522)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1521 SPECS/kernel.spec:1.441.2.1522
--- SPECS/kernel.spec:1.441.2.1521 Thu May 4 10:11:21 2006
+++ SPECS/kernel.spec Fri May 5 15:19:46 2006
@@ -11,10 +11,7 @@
%bcond_without pcmcia # don't build pcmcia
%bcond_with grsec_full # build full grsecurity
-%bcond_with preemptive # build preemptive kernel
-%bcond_with suspend2 # build software suspend support
%bcond_with verbose # verbose build (V=1)
-%bcond_with vserver # added vserver
%bcond_with xen0 # added Xen0 support
%bcond_with xenU # added XenU support
%bcond_without grsecurity # don't build grsecurity at all
@@ -37,8 +34,8 @@
%define with_grsecurity 1
%endif
-%if %{with grsec_full} && %{with vserver}
-full grsecurity conflicts with vserver
+%if %{with grsec_full}
+TODO: full grsecurity conflicts with vserver
%endif
%ifarch sparc
@@ -112,7 +109,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_grsec_full:-grsecurity}%{?with_vserver:-vserver}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_preemptive:-preempt}
+Name:
kernel%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
%define _postver .13
#define _postver %{nil}
Version: 2.6.16%{_postver}
@@ -676,11 +673,9 @@
%endif
%patch200 -p1
-%if %{with suspend2}
for i in suspend2-%{suspend_version}-for-2.6.16.9/[0-9]*; do
patch -p1 -s < $i
done
-%endif
# reiserfs4
%{__gzip} -dc %{SOURCE12} | %{__patch} -s -p1
@@ -749,12 +744,10 @@
%patch60 -p1
-%if %{with vserver}
%patch100 -p1
%if %{with grsec_minimal}
%patch101 -p1
%endif
-%endif
%if %{with xen0} || %{with xenU}
%ifarch %{ix86}
@@ -762,11 +755,8 @@
%endif
%endif
-%if %{with grsec_minimal} && %{without vserver}
-%patch1000 -p1
-%endif
-
-%if %{with grsec_full} && %{without vserver}
+%if %{with grsec_full}
+%error TODO
%patch9999 -p1
%endif
@@ -862,14 +852,11 @@
# squashfs
cat %{SOURCE41} >> arch/%{_target_base_arch}/defconfig
-%if %{with suspend2}
cat %{SOURCE42} >> arch/%{_target_base_arch}/defconfig
-%endif
-%if %{with vserver}
+ # Vserver hack, TODO: move it to .config
sed -i 's/^CONFIG_VMSPLIT_//g' arch/%{_target_base_arch}/defconfig
cat %{SOURCE43} >> arch/%{_target_base_arch}/defconfig
-%endif
# vesafb-tng
cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig
@@ -889,13 +876,6 @@
# fbsplash
echo "CONFIG_FB_SPLASH=y" >> 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
- echo "# CONFIG_DEBUG_PREEMPT is not set" >>
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}
@@ -1152,7 +1132,7 @@
title='PLD Linux'
fi
-
ext='%{?with_grsec_full:grsecurity}%{?with_vserver:vserver}%{?with_xen0:Xen0}%{?with_xenU:XenU}%{?with_preemptive:preempt}'
+ ext='%{?with_grsec_full:grsecurity}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
if [ "$ext" ]; then
title="$title $ext"
fi
@@ -1224,7 +1204,7 @@
title='PLD Linux'
fi
-
ext='%{?with_grsec_full:grsecurity}%{?with_vserver:vserver}%{?with_xen0:Xen0}%{?with_xenU:XenU}%{?with_preemptive:preempt}'
+ ext='%{?with_grsec_full:grsecurity}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
if [ "$ext" ]; then
title="$title $ext"
fi
@@ -1607,6 +1587,15 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1522 2006/05/05 13:19:46 baggins
+- removed bconds: preemptive, suspend2, vserver
+ now these features are enabled unconditionally, preempt as built in
+ CONFIG_PREEMPT_VOLUNTARY and CONFIG_PREEMPT_BKL
+
+Rationale: These features are non-intrusive and have no noticable impact
+ on kernel performance, thus having them on bconds is unnecessary
+ complicating build process.
+
Revision 1.441.2.1521 2006/05/04 08:11:21 cieciwa
- updated to 2.6.16.13,
- updated MD5 sum,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1521&r2=1.441.2.1522&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
