rpms/kernel/devel kernel.spec,1.1266,1.1267

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8084

Modified Files:
	kernel.spec 
Log Message:
Drop paeonly target, just do pae kernel on i686 when baseonly is requested


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1266
retrieving revision 1.1267
diff -u -r1.1266 -r1.1267
--- kernel.spec	5 Feb 2009 21:11:18 -0000	1.1266
+++ kernel.spec	5 Feb 2009 21:15:28 -0000	1.1267
@@ -77,8 +77,6 @@
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
 # kernel-smp (only valid for ppc 32-bit, sparc64)
 %define with_smp       %{?_without_smp:       0} %{?!_without_smp:       1}
-# kernel-PAE (only valid for i686)
-%define with_pae       %{?_without_pae:       0} %{?!_without_pae:       1}
 # kernel-kdump
 %define with_kdump     %{?_without_kdump:     0} %{?!_without_kdump:     1}
 # kernel-debug
@@ -111,8 +109,6 @@
 %define with_baseonly  %{?_with_baseonly:     1} %{?!_with_baseonly:     0}
 # Only build the smp kernel (--with smponly):
 %define with_smponly   %{?_with_smponly:      1} %{?!_with_smponly:      0}
-# Only build the pae kernel (--with paeonly):
-%define with_paeonly   %{?_with_paeonly:      1} %{?!_with_paeonly:      0}
 
 # should we do C=1 builds with sparse
 %define with_sparse	%{?_with_sparse:      1} %{?!_with_sparse:      0}
@@ -191,10 +187,18 @@
 %endif
 %define debuginfodir /usr/lib/debug
 
+# We only build -PAE for 686 as of Fedora 11.
+%ifarch i686
+%define with_up 0
+%define with_pae 1
+%endif
+
 # if requested, only build base kernel
 %if %{with_baseonly}
 %define with_smp 0
+%ifnarch i686
 %define with_pae 0
+%endif
 %define with_kdump 0
 %define with_debug 0
 %endif
@@ -207,14 +211,6 @@
 %define with_debug 0
 %endif
 
-# if requested, only build pae kernel
-%if %{with_paeonly}
-%define with_up 0
-%define with_smp 0
-%define with_kdump 0
-%define with_debug 0
-%endif
-
 %define all_x86 i386 i586 i686
 
 %if %{with_vdso_install}
@@ -229,11 +225,6 @@
 %define with_smp 0
 %endif
 
-# pae is only valid on i686
-%ifnarch i686
-%define with_pae 0
-%endif
-
 # only build kernel-kdump on ppc64
 # (no relocatable kernel support upstream yet)
 #FIXME: Temporarily disabled to speed up builds.
@@ -241,11 +232,6 @@
 %define with_kdump 0
 #endif
 
-# We only build -PAE for 686 as of Fedora 11.
-%ifarch i686
-%define with_up 0
-%endif
-
 # don't do debug builds on anything but i686 and x86_64
 %ifnarch i686 x86_64
 %define with_debug 0
@@ -883,13 +869,6 @@
 %endif
 %endif
 
-%if %{with_paeonly}
-%if !%{with_pae}
-echo "Cannot build --with paeonly, pae build is disabled"
-exit 1
-%endif
-%endif
-
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
 {