rpms/kernel/devel kernel-2.6.spec,1.2868,1.2869

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6337

Modified Files:
	kernel-2.6.spec 
Log Message:
kill off -kdump for 686/x86-64


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2868
retrieving revision 1.2869
diff -u -r1.2868 -r1.2869
--- kernel-2.6.spec	13 Dec 2006 17:16:32 -0000	1.2868
+++ kernel-2.6.spec	13 Dec 2006 19:34:03 -0000	1.2869
@@ -12,7 +12,7 @@
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 0
 %define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 %define buildheaders 1
 %define builddebug 0
 
@@ -51,19 +51,20 @@
 #OLPC stuff
 %if 0%{?olpc}
 %define buildxen 0
-%define buildkdump 0
 %endif
+
 # Don't build 586 kernels for RHEL builds.
 %if 0%{?rhel}
 %define all_x86 i386 i686
-# we differ here b/c of the reloc patches
-%ifarch i686 x86_64
-%define buildkdump 0
-%endif
 %else
 %define all_x86 i386 i586 i686
 %endif
 
+# PPC doesn't have relocatable kernel support yet so still needs a -kdump.
+%ifarch ppc64
+%define buildkdump 1
+%endif
+
 # Override generic defaults with per-arch defaults
 
 %ifarch noarch
@@ -73,11 +74,6 @@
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
-# kdump only builds on i686, x86_64, ppc64 ...
-%ifnarch i686 x86_64 ppc64 ppc64iseries
-%define buildkdump 0
-%endif
-
 # Xen only builds on i686, x86_64 and ia64 ...
 %ifnarch i686 x86_64 ia64
 %define buildxen 0
@@ -1791,8 +1787,11 @@
 #  - Xen
 #  - signed modules are broken
 #  - tux.
-# - kill off kdump
+
 %changelog
+* Wed Dec 13 2006 Dave Jones <davej at redhat.com>
+- Kill off -kdump for 686.
+
 * Wed Dec 13 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix and re-enable ppc, ppc64, ppciseries builds
 - Fix hdrcheck.sh invocation