rpms/kernel/devel Makefile.config, 1.31, 1.32 kernel-2.6.spec, 1.1884, 1.1885

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
Merge kdump improvements from Don Zickus.




Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.config	8 Nov 2005 14:56:46 -0000	1.31
+++ Makefile.config	31 Jan 2006 22:13:01 -0000	1.32
@@ -7,7 +7,7 @@
 CONFIGFILES	= \
 	$(CFG)-i686.config $(CFG)-i686-smp.config $(CFG)-i686-kdump.config \
 	$(CFG)-i586.config \
-	$(CFG)-x86_64.config \
+	$(CFG)-x86_64.config $(CFG)-x86_64-kdump.config \
 	$(CFG)-ppc64iseries.config \
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
@@ -82,6 +82,9 @@
 kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic 
 	perl scripts/merge.pl $^ x86_64 > $@
 
+kernel-$(VERSION)-x86_64-kdump.config: configs/config-x86_64-kdump temp-x86_64-generic 
+	perl scripts/merge.pl $^ x86_64 > $@
+
 kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic 
 	perl scripts/merge.pl $^ sparc > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1884
retrieving revision 1.1885
diff -u -r1.1884 -r1.1885
--- kernel-2.6.spec	30 Jan 2006 22:43:47 -0000	1.1884
+++ kernel-2.6.spec	31 Jan 2006 22:13:01 -0000	1.1885
@@ -61,6 +61,7 @@
 
 %ifarch x86_64
 %define buildsmp 0
+%define buildkdump 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -199,6 +200,7 @@
 Source31: kernel-%{kversion}-i686-xen0.config
 Source32: kernel-%{kversion}-i686-xenU.config
 Source33: kernel-%{kversion}-i686-kdump.config
+Source33: kernel-%{kversion}-x86_64-kdump.config
 #Source34: kernel-%{kversion}-sparc.config
 #Source35: kernel-%{kversion}-sparc64.config
 #Source36: kernel-%{kversion}-sparc64-smp.config
@@ -995,12 +997,11 @@
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
-%if "%{buildkdump}" == "1"
-    if [ `grep CONFIG_CRASH_DUMP=y .config` ]; then
+
+    if [ "$1" == "kdump" ]; then
         cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer
         rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
     fi
-%endif
 
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
@@ -1377,6 +1378,9 @@
 %endif
 
 %changelog
+* Tue Jan 31 2006 Don Zickus <<dzickus at redhat.com>
+- Enable x86-64 kdumping, and kdump related specfile cleanup.
+
 * Mon Jan 30 2006 Dave Jones <davej at redhat.com>
 - Dan Williams' goodies for wireless drivers to make NetworkManager
   work with WEP/WPA on ipw2200, and WEP on airo.