rpms/kernel/devel kernel-2.6.spec,1.1872,1.1873

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
make kdump kernels buildable again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1872
retrieving revision 1.1873
diff -u -r1.1872 -r1.1873
--- kernel-2.6.spec	26 Jan 2006 03:40:32 -0000	1.1872
+++ kernel-2.6.spec	26 Jan 2006 16:48:08 -0000	1.1873
@@ -48,8 +48,7 @@
 
 %ifarch i686
 %define buildxen %{includexen}
-# broken for now.
-%define buildkdump 0
+%define buildkdump 1
 %else
 %define buildxen 0
 %endif
@@ -982,7 +981,9 @@
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
 %if "%{buildkdump}" == "1"
-	cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer
+    if [ `grep CONFIG_CRASH_DUMP=y .config` ]; then
+        cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer
+    fi
 %endif
 
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
@@ -1011,7 +1012,7 @@
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cp arch/%{_arch}/kernel/asm-offsets.s $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/kernel || :
     cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
-	cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+    cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     if [ -d arch/%{_arch}/scripts ]; then
       cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
@@ -1360,6 +1361,9 @@
 %endif
 
 %changelog
+* Thu Jan 26 2006 Dave Jones <davej at redhat.com>
+- Fix building of kdump kernels.
+
 * Wed Jan 25 2006 Dave Jones <davej at redhat.com>
 - Disable page allocation debugging again.