Author: sparky Date: Sat Sep 27 22:37:51 2008 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- no more TuneUpConfigForIX86, ix86 subarchitecture optimization info is
specified in kernel-i386.config
- pae moved to imporatnt.config
---- Files affected:
SPECS:
kernel.spec (1.441.2.1968 -> 1.441.2.1969)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1968 SPECS/kernel.spec:1.441.2.1969
--- SPECS/kernel.spec:1.441.2.1968 Sat Sep 27 02:27:17 2008
+++ SPECS/kernel.spec Sun Sep 28 00:37:44 2008
@@ -933,32 +933,6 @@
find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 |
xargs -0 -r -l512 rm -f
%build
-TuneUpConfigForIX86 () {
- set -x
- cat <<-EOCONFIG > $1
-%ifarch %{ix86}
- # this part can be moved into i386 config file
- CONFIG_M386 i386=y i486=n i586=n i686=n pentium3=n pentium4=n
athlon=n
- CONFIG_M486 i386=n i486=y
- CONFIG_M586 i386=n i586=y
- CONFIG_M686 i386=n i686=y
- CONFIG_MPENTIUMIII i386=n pentium3=y
- CONFIG_MPENTIUM4 i386=n pentium4=y
- CONFIG_MK7 i386=n athlon=y
-
- CONFIG_MATH_EMULATION i386=y i686=n pentium3=n pentium4=n
athlon=n
- %ifarch i686 athlon pentium3 pentium4
- %if %{with pae}
- CONFIG_HIGHMEM4G=n
- CONFIG_HIGHMEM64G=y
- CONFIG_X86_PAE=y
- %endif
- %endif
-%endif
-EOCONFIG
- return 0
-}
-
PaXconfig () {
set -x
cat <<-EOCONFIG > $1
@@ -1077,6 +1051,14 @@
CONFIG_IPV6=n
%endif
+%ifarch i686 athlon pentium3 pentium4
+ %if %{with pae}
+ CONFIG_HIGHMEM4G=n
+ CONFIG_HIGHMEM64G=y
+ CONFIG_X86_PAE=y
+ %endif
+%endif
+
%if %{with fbcondecor}
CONFIG_FB_S3=n
CONFIG_FB_VT8623=n
@@ -1091,8 +1073,6 @@
%endif
EOCONFIG
- TuneUpConfigForIX86 ix86.config
-
RescueConfig rescue.config
PaXconfig pax.config
@@ -1154,7 +1134,6 @@
%endif
%{SOURCE40} %{?0:netfilter} \
%{SOURCE41} %{?0:squashfs} \
- ix86.config \
%{SOURCE19} \
$RPM_SOURCE_DIR/kernel-$Config.config \
> %{defconfig}
@@ -1674,6 +1653,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1969 2008/09/27 22:37:44 sparky
+- no more TuneUpConfigForIX86, ix86 subarchitecture optimization info is
+ specified in kernel-i386.config
+- pae moved to imporatnt.config
+
Revision 1.441.2.1968 2008/09/27 00:27:17 sparky
- fix cross-building when host is ppc or ppc64
- define HOSTCC
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1968&r2=1.441.2.1969&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
