rpms/kernel/devel kernel.spec,1.414,1.415

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	kernel.spec 
Log Message:
- Fix debuginfo sorting regexp.
- Strip ELF vmlinux used as /boot image.
- Reenable ppc build.




Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- kernel.spec	11 Feb 2008 00:50:29 -0000	1.414
+++ kernel.spec	11 Feb 2008 10:09:58 -0000	1.415
@@ -363,7 +363,7 @@
 
 # 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.
-%define nobuildarches i386 s390 sparc ppc
+%define nobuildarches i386 s390 sparc
 
 %ifarch %nobuildarches
 %define with_up 0
@@ -748,7 +748,7 @@
 %description -n %{name}%{?1:-%{1}}-debuginfo\
 This package provides debug information for package %{name}%{?1:-%{1}}.\
 This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
-%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}' -o debuginfo%{?1}.list}\
+%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}\
 %{nil}
 
 #
@@ -1311,10 +1311,16 @@
 '$(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@'
 %endif
 
+cp_vmlinux()
+{
+  eu-strip --remove-comment -o "$2" "$1"
+}
+
 BuildKernel() {
     MakeTarget=$1
     KernelImage=$2
     Flavour=$3
+    InstallName=${4:-vmlinuz}
 
     # Pick the right config file for the kernel we're building
     if [ -n "$Flavour" ] ; then
@@ -1327,6 +1333,14 @@
       DevelLink=
     fi
 
+    # When the bootable image is just the ELF kernel, strip it.
+    # We already copy the unstripped file into the debuginfo package.
+    if [ "$KernelImage" = vmlinux ]; then
+      CopyKernel=cp_vmlinux
+    else
+      CopyKernel=cp
+    fi
+
     KernelVer=%{version}-%{release}$Flavour
     echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}...
 
@@ -1362,15 +1376,11 @@
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
     touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
-    cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
-
-    if [ "$Flavour" == "kdump" ]; then
-        cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer
-        rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
-    fi
+    $CopyKernel $KernelImage \
+    		$RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
 
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
@@ -1542,7 +1552,7 @@
 %endif
 
 %if %{with_kdump}
-BuildKernel %make_target %kernel_image kdump
+BuildKernel vmlinux vmlinux kdump vmlinux
 %endif
 
 ###
@@ -1805,6 +1815,11 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Feb 11 2008 Roland McGrath <roland at redhat.com>
+- Fix debuginfo sorting regexp.
+- Strip ELF vmlinux used as /boot image.
+- Reenable ppc build.
+
 * Sun Feb 10 2008 Chuck Ebbert <cebbert at redhat.com>
 - Enable Infiniband connected mode support. (F8#432196)