Author: adamg Date: Sat Jun 24 14:25:12 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- pae bcond
---- Files affected:
SPECS:
kernel-desktop.spec (1.35 -> 1.36)
---- Diffs:
================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.35 SPECS/kernel-desktop.spec:1.36
--- SPECS/kernel-desktop.spec:1.35 Sat Jun 24 01:33:39 2006
+++ SPECS/kernel-desktop.spec Sat Jun 24 16:25:06 2006
@@ -11,6 +11,7 @@
%bcond_with bootsplash # build with bootsplash instead of fbsplash
%bcond_with laptop # build with HZ=100
%bcond_with verbose # verbose build (V=1)
+%bcond_with pae # build PAE (HIGHMEM64G) support on uniprocessor
%{?debug:%define with_verbose 1}
@@ -726,6 +727,11 @@
%build
TuneUpConfigForIX86 () {
%ifarch %{ix86}
+ pae=
+ [ "$2" = "yes" ] && pae=yes
+ %if %{with pae}
+ pae=yes
+ %endif
%ifnarch i386
sed -i 's:CONFIG_M386=y:# CONFIG_M386 is not set:' $1
%endif
@@ -748,8 +754,10 @@
sed -i 's:# CONFIG_MK7 is not set:CONFIG_MK7=y:' $1
%endif
%ifarch i686 athlon pentium3 pentium4
- sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
- sed -i "s:# CONFIG_HIGHMEM64G is not
set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
+ if [ "$pae" = "yes" ]; then
+ sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
+ sed -i "s:# CONFIG_HIGHMEM64G is not
set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
+ fi
sed -i 's:CONFIG_MATH_EMULATION=y:# CONFIG_MATH_EMULATION is not set:'
$1
%endif
%endif
@@ -786,7 +794,7 @@
cat %{SOURCE20} > arch/%{_target_base_arch}/defconfig
cat $RPM_SOURCE_DIR/kernel-desktop-$Config.config >>
arch/%{_target_base_arch}/defconfig
- TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig
+ TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig "$smp"
# preempt
%if %{with preemptrt}
@@ -1389,6 +1397,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2006/06/24 14:25:06 adamg
+- pae bcond
+
Revision 1.35 2006/06/23 23:33:39 sparky
- rel 0.5: this one (without alterating bconds) works on amd64 and ppc;
feel free to test ix86 (i don't use it)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel-desktop.spec?r1=1.35&r2=1.36&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
