rpms/kernel/F-13 kernel.spec,1.2051,1.2052

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32561

Modified Files:
	kernel.spec 
Log Message:
neuter s390x pseudo-kdump config, we don't carry rhel's zfcpdump patches


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2051
retrieving revision 1.2052
diff -u -p -r1.2051 -r1.2052
--- kernel.spec	2 Jun 2010 07:10:22 -0000	1.2051
+++ kernel.spec	2 Jun 2010 14:48:48 -0000	1.2052
@@ -271,11 +271,7 @@ Summary: The Linux kernel
 %define with_smp 0
 %endif
 
-%ifarch s390x
-%define with_kdump 1
-%else
 %define with_kdump 0
-%endif
 
 # don't do debug builds on anything but i686 and x86_64
 %ifnarch i686 x86_64
@@ -414,7 +410,7 @@ Summary: The Linux kernel
 # 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.
+# and we no longer build for 31bit s390. Same for 32bit sparc and arm.
 %define nobuildarches i386 s390 sparc %{arm}
 
 %ifarch %nobuildarches
@@ -545,10 +541,6 @@ BuildRequires: sparse >= 0.4.1
 BuildRequires: elfutils-libelf-devel zlib-devel binutils-devel libdwarf-devel
 %endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
-%ifarch s390x
-# Ensure glibc{,-devel} is installed so zfcpdump can be built
-BuildRequires: glibc-static
-%endif
 
 %define fancy_debuginfo 0
 %if %{with_debuginfo}
@@ -588,7 +580,6 @@ Source53: config-powerpc64
 Source60: config-ia64-generic
 
 Source70: config-s390x
-Source71: config-s390x-kdump
 
 Source90: config-sparc64-generic
 
@@ -1659,16 +1650,9 @@ BuildKernel() {
     Arch=`head -1 .config | cut -b 3-`
     echo USING ARCH=$Arch
 
-    if [ "$Arch" == "s390" -a "$Flavour" == "kdump" ]; then
-        pushd arch/s390/boot
-        gcc -static -o zfcpdump zfcpdump.c
-        popd
-    fi
     make -s ARCH=$Arch %{oldconfig_target} > /dev/null
     make -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags}
-    if [ "$Arch" != "s390" -o "$Flavour" != "kdump" ]; then
-        make -s ARCH=$Arch V=1 %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
-    fi
+    make -s ARCH=$Arch V=1 %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
 
 %if %{with_perftool}
     pushd tools/perf
@@ -1705,11 +1689,8 @@ BuildKernel() {
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     # Override $(mod-fw) because we don't want it to install any firmware
     # We'll do that ourselves with 'make firmware_install'
-    if [ "$Arch" != "s390" -o "$Flavour" != "kdump" ]; then
-        make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
-    else
-        mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/{kernel,extra}
-    fi
+    make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
+
 %ifarch %{vdso_arches}
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
     if grep '^CONFIG_XEN=y$' .config >/dev/null; then
@@ -1876,12 +1857,8 @@ BuildKernel %make_target %kernel_image s
 %endif
 
 %if %{with_kdump}
-%ifarch s390x
-BuildKernel %make_target %kernel_image kdump
-%else
 BuildKernel vmlinux vmlinux kdump vmlinux
 %endif
-%endif
 
 %if %{with_doc}
 # Make the HTML and man pages.
@@ -2097,25 +2074,6 @@ fi}\
 %kernel_variant_post -v PAEdebug -r (kernel|kernel-smp|kernel-xen)
 %kernel_variant_preun PAEdebug
 
-%ifarch s390x
-%postun kdump
-    # Create softlink to latest remaining kdump kernel.
-    # If no more kdump kernel is available, remove softlink.
-    if [ "$(readlink /boot/zfcpdump)" == "/boot/vmlinuz-%{KVERREL}.kdump" ]
-    then
-        vmlinuz_next=$(ls /boot/vmlinuz-*.kdump 2> /dev/null | sort | tail -n1)
-        if [ $vmlinuz_next ]
-        then
-            ln -sf $vmlinuz_next /boot/zfcpdump
-        else
-            rm -f /boot/zfcpdump
-        fi
-    fi
-
-%post kdump
-    ln -sf /boot/vmlinuz-%{KVERREL}.kdump /boot/zfcpdump
-%endif
-
 if [ -x /sbin/ldconfig ]
 then
     /sbin/ldconfig -X || exit $?
@@ -2230,11 +2188,7 @@ fi
 %kernel_variant_files %{with_debug} debug
 %kernel_variant_files %{with_pae} PAE
 %kernel_variant_files %{with_pae_debug} PAEdebug
-%ifarch s390x
-%kernel_variant_files %{with_kdump} kdump
-%else
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
-%endif
 
 # plz don't put in a version string unless you're going to tag
 # and build.