rpms/kernel/devel kernel.spec,1.1617,1.1618

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Log Message:
* Wed Jul 08 2009 Kyle McMartin <kyle at redhat.com>
- First cut of /usr/sbin/perf wrapper script and 'perf'
  subpackage.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1617
retrieving revision 1.1618
diff -u -p -r1.1617 -r1.1618
--- kernel.spec	8 Jul 2009 17:28:48 -0000	1.1617
+++ kernel.spec	8 Jul 2009 19:25:38 -0000	1.1618
@@ -88,6 +88,8 @@ Summary: The Linux kernel
 # kernel-firmware
 %define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
 # tools/perf
+%define with_perftool  %{?_without_perftool:  0} %{?!_without_perftool:  1}
+# perf noarch subpkg
 %define with_perf      %{?_without_perf:      0} %{?!_without_perf:      1}
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
@@ -244,6 +246,7 @@ Summary: The Linux kernel
 # only package docs noarch
 %ifnarch noarch
 %define with_doc 0
+%define with_perf 0
 %endif
 
 # no need to build headers again for these arches,
@@ -379,7 +382,7 @@ Summary: The Linux kernel
 %define with_pae 0
 %define with_kdump 0
 %define with_debuginfo 0
-%define with_perf 0
+%define with_perftool 0
 %define _enable_debug_packages 0
 %endif
 
@@ -486,7 +489,7 @@ BuildRequires: xmlto
 %if %{with_sparse}
 BuildRequires: sparse >= 0.4.1
 %endif
-%if %{with_perf}
+%if %{with_perftool}
 BuildRequires: elfutils-libelf-devel zlib-devel
 %endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
@@ -743,6 +746,13 @@ Group: Development/Debug
 This package is required by %{name}-debuginfo subpackages.
 It provides the kernel source files common to all builds.
 
+%package -n perf
+Summary: Performance monitoring for the Linux kernel
+Group: Development/System
+License: GPLv2
+%description -n perf
+This package provides the supporting documentation for the perf tool
+shipped in each kernel image subpackage.
 
 #
 # This macro creates a kernel-<subpackage>-debuginfo package.
@@ -1344,7 +1354,7 @@ BuildKernel() {
     make -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags}
     make -s ARCH=$Arch V=1 %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
 
-%if %{with_perf}
+%if %{with_perftool}
     pushd tools/perf
 # make sure the scripts are executable... won't be in tarball until 2.6.31 :/
     chmod +x util/generate-cmdlist.sh util/PERF-VERSION-GEN
@@ -1555,6 +1565,7 @@ chmod -R a=rX Documentation
 find Documentation -type d | xargs chmod u+w
 %endif
 
+
 ###
 ### Special hacks for debuginfo subpackages.
 ###
@@ -1599,6 +1610,17 @@ xargs -0 --no-run-if-empty %{__install} 
 ls $man9dir | grep -q '' || > $man9dir/BROKEN
 %endif
 
+%if %{with_perf}
+# perf docs and shell wrapper.
+mkdir -p $RPM_BUILD_ROOT/usr/sbin
+cat <<EOF >>$RPM_BUILD_ROOT/usr/sbin/perf
+#!/bin/bash
+exec /usr/libexec/perf-`uname -r`
+EOF
+chmod 755 $RPM_BUILD_ROOT/usr/sbin/perf
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
+%endif
+
 %if %{with_headers}
 # Install kernel headers
 make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
@@ -1762,6 +1784,13 @@ fi
 %{_datadir}/man/man9/*
 %endif
 
+%if %{with_perf}
+%files -n perf
+%defattr(-,root,root)
+%{_datadir}/doc/perf
+/usr/sbin/perf
+%endif
+
 # This is %{image_install_path} on an arch where that includes ELF files,
 # or empty otherwise.
 %define elf_image_install_path %{?kernel_image_elf:%{image_install_path}}
@@ -1777,7 +1806,7 @@ fi
 %defattr(-,root,root)\
 /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\
 /boot/System.map-%{KVERREL}%{?2:.%{2}}\
-%if %{with_perf}\
+%if %{with_perftool}\
 /usr/libexec/perf-%{KVERREL}%{?2:.%{2}}\
 %endif\
 #/boot/symvers-%{KVERREL}%{?2:.%{2}}.gz\
@@ -1834,6 +1863,10 @@ fi
 # and build.
 
 %changelog
+* Wed Jul 08 2009 Kyle McMartin <kyle at redhat.com>
+- First cut of /usr/sbin/perf wrapper script and 'perf'
+  subpackage.
+
 * Wed Jul 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.54.rc2.git2
 - Rebase and re-apply all the Fedora-specific linux-2.6-debug-*
   patches.