rpms/kernel/devel Makefile.config, 1.54, 1.55 kernel-2.6.spec, 1.3178, 1.3179

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23054

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
* Sun May 27 2007 Dave Jones <davej at redhat.com>
- As the x86-64 kernel is now relocatable, -kdump can go.



Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Makefile.config	28 May 2007 01:32:18 -0000	1.54
+++ Makefile.config	28 May 2007 01:41:14 -0000	1.55
@@ -8,8 +8,7 @@
 	$(CFG)-i586.config \
 	$(CFG)-i686.config $(CFG)-i686-PAE.config \
 	$(CFG)-i686-debug.config $(CFG)-i686-PAE-debug.config \
-	$(CFG)-x86_64.config $(CFG)-x86_64-kdump.config \
-	$(CFG)-x86_64-debug.config \
+	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
@@ -106,9 +105,6 @@
 kernel-$(VERSION)-x86_64-debug.config: configs/config-x86_64 temp-x86_64-debug-generic
 	perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-x86_64-kdump.config: configs/config-x86_64-kdump temp-x86_64-generic
-	perl merge.pl $^ x86_64 > $@
-
 kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic
 	perl merge.pl $^ sparc > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3178
retrieving revision 1.3179
diff -u -r1.3178 -r1.3179
--- kernel-2.6.spec	28 May 2007 01:32:18 -0000	1.3178
+++ kernel-2.6.spec	28 May 2007 01:41:14 -0000	1.3179
@@ -113,10 +113,6 @@
 %if 0%{?rhel}
 # don't build i586 RHEL kernels
 %define all_x86 i386 i686
-# RHEL has not-yet-upstream relocatable x86_64
-%ifarch x86_64
-%define with_kdump 0
-%endif
 # if building for Fedora
 %else
 %define all_x86 i386 i586 i686
@@ -139,9 +135,9 @@
 %define with_xen 0
 %endif
 
-# only build kernel-kdump on x86_64 and ppc64
+# only build kernel-kdump on ppc64
 # (no relocatable kernel support upstream yet)
-%ifnarch x86_64 ppc64 ppc64iseries
+%ifnarch ppc64
 %define with_kdump 0
 %endif
 
@@ -355,7 +351,6 @@
 
 Source25: kernel-%{kversion}-x86_64.config
 Source26: kernel-%{kversion}-x86_64-debug.config
-Source27: kernel-%{kversion}-x86_64-kdump.config
 
 Source28: kernel-%{kversion}-ppc.config
 Source29: kernel-%{kversion}-ppc-smp.config
@@ -1288,17 +1283,10 @@
 
 cp -f %{all_arch_configs} .
 
-
-%if 0%{?rhel}
-# don't need these for relocatable kernels
-rm -f kernel-%{kversion}-{i686,x86_64}-kdump.config
-%endif
-
 %if 0%{?olpc}
 # don't need these for OLPC
 rm -f kernel-%{kversion}-*PAE*.config
 rm -f kernel-%{kversion}-*xen*.config
-rm -f kernel-%{kversion}-*kdump*.config
 %endif
 
 %if 0%{?debugbuildsenabled}
@@ -2232,6 +2220,9 @@
 
 %changelog
 * Sun May 27 2007 Dave Jones <davej at redhat.com>
+- As the x86-64 kernel is now relocatable, -kdump can go.
+
+* Sun May 27 2007 Dave Jones <davej at redhat.com>
 - Remove last remains of 31bit s390 support.
 
 * Sun May 27 2007 Dave Jones <davej at redhat.com>