rpms/kernel/devel kernel.spec,1.1585,1.1586

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Log Message:
* Mon Jun 22 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.23.rc0.git18
- Enable tools/perf, installed as /bin/perf-$KernelVer. Docs and a /bin/perf
  wrapper come next if this builds ok.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1585
retrieving revision 1.1586
diff -u -p -r1.1585 -r1.1586
--- kernel.spec	22 Jun 2009 16:15:12 -0000	1.1585
+++ kernel.spec	22 Jun 2009 19:32:59 -0000	1.1586
@@ -87,6 +87,8 @@ Summary: The Linux kernel
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
 %define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+# tools/perf
+%define with_perf      %{?_without_perf:      0} %{?!_without_perf:      1}
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
@@ -377,6 +379,7 @@ Summary: The Linux kernel
 %define with_pae 0
 %define with_kdump 0
 %define with_debuginfo 0
+%define with_perf 0
 %define _enable_debug_packages 0
 %endif
 
@@ -483,6 +486,9 @@ BuildRequires: xmlto
 %if %{with_sparse}
 BuildRequires: sparse >= 0.4.1
 %endif
+%if %{with_perf}
+BuildRequires: elfutils-libelf-devel
+%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 %define fancy_debuginfo 0
@@ -1350,6 +1356,17 @@ 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}
+    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
+    make -s V=1 %{?_smp_mflags} perf
+#later#    make -s V=1 %{?_smp_mflags} doc
+    mkdir -p $RPM_BUILD_ROOT/bin
+    install -m 755 perf $RPM_BUILD_ROOT/bin/perf-$KernelVer
+    popd
+%endif
+
     # Start installing the results
 %if %{with_debuginfo}
     mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/boot
@@ -1772,6 +1789,9 @@ fi
 %defattr(-,root,root)\
 /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\
 /boot/System.map-%{KVERREL}%{?2:.%{2}}\
+%if %{with_perf}\
+/bin/perf-%{KVERREL}%{?2:.%{2}}\
+%endif\
 #/boot/symvers-%{KVERREL}%{?2:.%{2}}.gz\
 /boot/config-%{KVERREL}%{?2:.%{2}}\
 %dir /lib/modules/%{KVERREL}%{?2:.%{2}}\
@@ -1826,6 +1846,10 @@ fi
 # and build.
 
 %changelog
+* Mon Jun 22 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.23.rc0.git18
+- Enable tools/perf, installed as /bin/perf-$KernelVer. Docs and a /bin/perf
+  wrapper come next if this builds ok.
+
 * Mon Jun 22 2009 Kyle McMartin <kyle at redhat.com>
 - sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch: pull in
   two fixes from Mike Galbraith from tip.git