rpms/kernel/devel Makefile.config, 1.71, 1.72 config-sparc64-generic, 1.26, 1.27 kernel.spec, 1.1711, 1.1712 config-sparc64-smp, 1.3, NONE

[Dennis Gilmore]

Author: ausil

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3365

Modified Files:
	Makefile.config config-sparc64-generic kernel.spec 
Removed Files:
	config-sparc64-smp 
Log Message:
disable building -smp and -perf on sparc64



Index: Makefile.config
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- Makefile.config	20 Jul 2009 16:43:59 -0000	1.71
+++ Makefile.config	12 Aug 2009 02:27:23 -0000	1.72
@@ -10,7 +10,7 @@ CONFIGFILES	= \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config $(CFG)-arm.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
-	$(CFG)-sparc64.config $(CFG)-sparc64-smp.config \
+	$(CFG)-sparc64.config  \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ppc64-debug.config \
 	$(CFG)-ia64.config
 
@@ -80,9 +80,6 @@ kernel-$(VERSION)-x86_64.config: /dev/nu
 kernel-$(VERSION)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
 	perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-sparc64-smp.config: config-sparc64-smp temp-sparc64-generic
-	perl merge.pl $^ sparc64 > $@
-
 kernel-$(VERSION)-sparc64.config: /dev/null temp-sparc64-generic
 	perl merge.pl $^ sparc64 > $@
 


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- config-sparc64-generic	8 Aug 2009 19:36:06 -0000	1.26
+++ config-sparc64-generic	12 Aug 2009 02:27:23 -0000	1.27
@@ -1,4 +1,4 @@
-# CONFIG_SMP is not set
+CONFIG_SMP=y
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
 CONFIG_SECCOMP=y
@@ -199,5 +199,3 @@ CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 
 CONFIG_RCU_FANOUT=64
-
-# CONFIG_KGDB is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1711
retrieving revision 1.1712
diff -u -p -r1.1711 -r1.1712
--- kernel.spec	11 Aug 2009 21:55:35 -0000	1.1711
+++ kernel.spec	12 Aug 2009 02:27:23 -0000	1.1712
@@ -78,7 +78,7 @@ Summary: The Linux kernel
 #
 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
-# kernel-smp (only valid for ppc 32-bit, sparc64)
+# kernel-smp (only valid for ppc 32-bit)
 %define with_smp       %{?_without_smp:       0} %{?!_without_smp:       1}
 # kernel-kdump
 %define with_kdump     %{?_without_kdump:     0} %{?!_without_kdump:     1}
@@ -230,8 +230,8 @@ Summary: The Linux kernel
 
 # Overrides for generic default options
 
-# only ppc and sparc64 need separate smp kernels
-%ifnarch ppc sparc64 alphaev56
+# only ppc and alphav56 need separate smp kernels
+%ifnarch ppc alphaev56
 %define with_smp 0
 %endif
 
@@ -317,6 +317,7 @@ Summary: The Linux kernel
 %define make_target image
 %define kernel_image arch/sparc/boot/image
 %define image_install_path boot
+%define with_perftool 0
 %endif
 
 %ifarch ppc
@@ -537,7 +538,6 @@ Source60: config-ia64-generic
 Source70: config-s390x
 
 Source90: config-sparc64-generic
-Source91: config-sparc64-smp
 
 Source100: config-arm
 
@@ -1980,6 +1980,10 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 11 2009 Dennis Gilmore <dennis at ausil.us> - 2.6.31-0.149.rc5.git3
+- disable building the -smp kernel on sparc64
+- disable building kernel-perf on sparc64 syscalls not supported
+
 * Tue Aug 11 2009 Eric Paris <eparis at redhat.com>
 - Enable config IMA
 


--- config-sparc64-smp DELETED ---