rpms/kernel/devel config-s390x,1.23,1.24 kernel.spec,1.2012,1.2013

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15274

Modified Files:
	config-s390x kernel.spec 
Log Message:
* Thu Jun 03 2010 Kyle McMartin <kyle at redhat.com>
- Build kernel headers on s390.



Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- config-s390x	8 Mar 2010 22:04:55 -0000	1.23
+++ config-s390x	3 Jun 2010 23:07:03 -0000	1.24
@@ -224,3 +224,5 @@ CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 
 CONFIG_SMSGIUCV_EVENT=m
+
+# CONFIG_PREEMPT_TRACER is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2012
retrieving revision 1.2013
diff -u -p -r1.2012 -r1.2013
--- kernel.spec	2 Jun 2010 15:45:34 -0000	1.2012
+++ kernel.spec	3 Jun 2010 23:07:03 -0000	1.2013
@@ -271,12 +271,7 @@ Summary: The Linux kernel
 %define with_smp 0
 %endif
 
-# only build kernel-kdump on ppc64
-# (no relocatable kernel support upstream yet)
-#FIXME: Temporarily disabled to speed up builds.
-#ifnarch ppc64
 %define with_kdump 0
-#endif
 
 # don't do debug builds on anything but i686 and x86_64
 %ifnarch i686 x86_64
@@ -343,10 +338,6 @@ Summary: The Linux kernel
 %define kernel_image arch/s390/boot/image
 %endif
 
-%ifarch sparc
-# We only build sparc headers since we dont support sparc32 hardware
-%endif
-
 %ifarch sparc64
 %define asmarch sparc
 %define all_arch_configs kernel-%{version}-sparc64*.config
@@ -407,8 +398,7 @@ Summary: The Linux kernel
 # us use the previous build of that package -- it'll just be completely AWOL.
 # Which is a BadThing(tm).
 
-# We don't build a kernel on i386; we only do kernel-headers there,
-# and we no longer build for 31bit S390. Same for 32bit sparc and arm.
+# We only build kernel-headers on the following...
 %define nobuildarches i386 s390 sparc %{arm}
 
 %ifarch %nobuildarches
@@ -518,7 +508,7 @@ Version: %{rpmversion}
 Release: %{pkg_release}
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %%nobuildarches (ABOVE) INSTEAD
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x alpha alphaev56 %{arm}
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x alpha alphaev56 %{arm}
 ExclusiveOS: Linux
 
 %kernel_reqprovconf
@@ -2059,6 +2049,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Thu Jun 03 2010 Kyle McMartin <kyle at redhat.com>
+- Build kernel headers on s390.
+
 * Wed Jun 02 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-20
 - Disable doc_build_fail because xmlto et al. are crud.