rpms/kernel/devel Makefile.config, 1.53, 1.54 kernel-2.6.spec, 1.3177, 1.3178

Dave Jones (davej) fedora-extras-commits at redhat.com
Mon May 28 01:32:53 UTC 2007


Author: davej

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
* Sun May 27 2007 Dave Jones <davej at redhat.com>
- Remove last remains of 31bit s390 support.



Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile.config	7 Mar 2007 07:25:46 -0000	1.53
+++ Makefile.config	28 May 2007 01:32:18 -0000	1.54
@@ -10,13 +10,13 @@
 	$(CFG)-i686-debug.config $(CFG)-i686-PAE-debug.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-kdump.config \
 	$(CFG)-x86_64-debug.config \
-	$(CFG)-s390.config $(CFG)-s390x.config \
+	$(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
 	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
 	$(CFG)-ia64-xen.config
 
-PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
+PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 # sparc sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
 
 configs: $(CONFIGFILES)
@@ -61,7 +61,7 @@
 temp-powerpc32-generic: configs/config-powerpc32-generic temp-powerpc-generic
 	perl merge.pl $^  > $@
 
-temp-s390-generic: configs/config-s390-generic temp-generic
+temp-s390-generic: configs/config-s390x temp-generic
 	perl merge.pl $^ > $@
 
 temp-ia64-generic: configs/config-ia64-generic temp-generic
@@ -127,9 +127,6 @@
 kernel-$(VERSION)-ppc64-kdump.config: configs/config-powerpc64-kdump kernel-$(VERSION)-ppc64.config
 	perl merge.pl $^ powerpc > $@
 
-kernel-$(VERSION)-s390.config: configs/config-s390 temp-s390-generic
-	perl merge.pl $^ s390 > $@
-
 kernel-$(VERSION)-s390x.config: configs/config-s390x temp-s390-generic
 	perl merge.pl $^ s390 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3177
retrieving revision 1.3178
diff -u -r1.3177 -r1.3178
--- kernel-2.6.spec	28 May 2007 01:22:43 -0000	1.3177
+++ kernel-2.6.spec	28 May 2007 01:32:18 -0000	1.3178
@@ -169,7 +169,7 @@
 %endif
 
 # don't sign modules on these platforms
-%ifarch s390 s390x sparc sparc64 ppc alpha
+%ifarch s390x sparc sparc64 ppc alpha
 %define with_modsign 0
 %endif
 
@@ -202,13 +202,6 @@
 %define hdrarch powerpc
 %endif
 
-%ifarch s390
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390*.config
-%define image_install_path boot
-%define make_target image
-%define kernel_image arch/s390/boot/image
-%endif
-
 %ifarch s390x
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
 %define image_install_path boot
@@ -262,7 +255,8 @@
 # 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 or s390x -- we only do kernel-headers there.
+# We don't build a kernel on i386, we only do kernel-headers there,
+# and we no longer build for 31bit S390.
 %define nobuildarches i386 s390
 
 %ifarch %nobuildarches
@@ -314,7 +308,7 @@
 %else
 # DO NOT CHANGE THIS LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %nobuildarches (ABOVE) INSTEAD
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x alpha alphaev56
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x alpha alphaev56
 %endif
 ExclusiveOS: Linux
 Provides: kernel-drm = 4.3.0
@@ -368,7 +362,6 @@
 Source30: kernel-%{kversion}-ppc64.config
 Source31: kernel-%{kversion}-ppc64-kdump.config
 
-Source34: kernel-%{kversion}-s390.config
 Source35: kernel-%{kversion}-s390x.config
 
 Source36: kernel-%{kversion}-ia64.config
@@ -420,7 +413,7 @@
 Patch304: linux-2.6-ibmvscsi-schizo.patch
 Patch305: linux-2.6-pmac-zilog.patch
 
-# 500 - 599   s390(x)
+# 500 - 599   s390x
 
 # 600 - 699   sparc(64)
 
@@ -2239,4 +2232,7 @@
 
 %changelog
 * 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>
 - Start F8 branch. Rebase to 2.6.22rc3




More information about the fedora-extras-commits mailing list