Trying to add s390 arch build back to FC-6 failed

Chuck Ebbert cebbert at redhat.com
Thu Aug 9 22:05:35 UTC 2007


What did I miss?

Not only did I not get s390 to build, somehow I broke s390x as well.
It doesn't even submit the build jobs...

Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.3003
retrieving revision 1.3004
diff -u -r1.3003 -r1.3004
--- kernel-2.6.spec	9 Aug 2007 21:01:34 -0000	1.3003
+++ kernel-2.6.spec	9 Aug 2007 21:26:49 -0000	1.3004
@@ -20,7 +20,7 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 %define fedora_cvs_origin 2968
-%define fedora_build %(R="$Revision: 1.3003 $"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin})
+%define fedora_build %(R="$Revision: 1.3004 $"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin})
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
@@ -247,7 +247,7 @@
 %endif
 
 # don't sign modules on these platforms
-%ifarch s390x sparc sparc64 ppc alpha
+%ifarch s390 s390x sparc sparc64 ppc alpha
 %define with_modsign 0
 %endif
 
@@ -280,6 +280,13 @@
 %define hdrarch powerpc
 %endif
 
+%ifarch s390
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-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-%{version}-s390x.config
 %define image_install_path boot
@@ -396,7 +403,7 @@
 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
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x alpha alphaev56
 ExclusiveOS: Linux
 Provides: kernel-drm = 4.3.0
 Provides: kernel-drm-nouveau = 6
@@ -449,7 +456,8 @@
 Source30: kernel-%{version}-ppc64.config
 Source31: kernel-%{version}-ppc64-kdump.config
 
-Source35: kernel-%{version}-s390x.config
+Source35: kernel-%{version}-s390.config
+Source36: kernel-%{version}-s390x.config
 
 Source36: kernel-%{version}-ia64.config
 
@@ -2263,6 +2271,10 @@
 
 %changelog
 * Thu Aug 09 2007 Chuck Ebbert <cebbert at redhat.com>
+- hopefully add s390 back to the build
+  (ugly hack, s390 overrides s390x, no -generic used)
+
+* Thu Aug 09 2007 Chuck Ebbert <cebbert at redhat.com>
 - disable CONFIG_SCSI_SCAN_ASYNC
 
 * Thu Aug 09 2007 Chuck Ebbert <cebbert at redhat.com>




More information about the kernel mailing list