rpms/oprofile/F-10 oprofile-0.9.5-timer.patch, NONE, 1.1 oprofile.spec, 1.77, 1.78
William Eden Cohen
wcohen at fedoraproject.org
Thu Oct 8 00:57:52 UTC 2009
Author: wcohen
Update of /cvs/pkgs/rpms/oprofile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20242
Modified Files:
oprofile.spec
Added Files:
oprofile-0.9.5-timer.patch
Log Message:
* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
- Allow timer mode to work.
- Correct location for addditional files in man pages. Resolves: rhbz #508669
oprofile-0.9.5-timer.patch:
opcontrol | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- NEW FILE oprofile-0.9.5-timer.patch ---
diff -up oprofile-0.9.5/utils/opcontrol.orig oprofile-0.9.5/utils/opcontrol
--- oprofile-0.9.5/utils/opcontrol.orig 2009-07-31 13:10:18.000000000 -0400
+++ oprofile-0.9.5/utils/opcontrol 2009-10-07 20:02:06.000000000 -0400
@@ -586,7 +586,7 @@ verify_counters()
# setup any needed default value in chosen events
normalise_events()
{
- if test "$NR_CHOSEN" -le 0; then
+ if test "$NR_CHOSEN" -le 0 || test "$IS_TIMER" = 1; then
return
fi
@@ -1449,8 +1449,12 @@ do_start_daemon()
--separate-thread=$SEPARATE_THREAD \
--separate-cpu=$SEPARATE_CPU"
- if ! test -z "$OPROFILED_EVENTS"; then
- OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+ if test "$IS_TIMER" = 1; then
+ OPD_ARGS="$OPD_ARGS --events="
+ else
+ if ! test -z "$OPROFILED_EVENTS"; then
+ OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+ fi
fi
if test "$VMLINUX" = "none"; then
Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/oprofile.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- oprofile.spec 4 Sep 2009 15:40:32 -0000 1.77
+++ oprofile.spec 8 Oct 2009 00:57:49 -0000 1.78
@@ -1,7 +1,7 @@
Summary: System wide profiler
Name: oprofile
Version: 0.9.5
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Group: Development/System
#
@@ -13,6 +13,7 @@ Patch10: oprofile-0.4-guess2.patch
Patch63: oprofile-0.7-libs.patch
Patch83: oprofile-0.9.3-xen.patch
#Patch104: oprofile-jvmpi-lgpl.patch
+Patch105: oprofile-0.9.5-timer.patch
URL: http://oprofile.sf.net
@@ -81,6 +82,7 @@ agent library.
%patch63 -p1 -b .libs
#%patch83 -p1 -b .xen
#%patch104 -p1 -b .lgpl
+%patch105 -p1 -b .timer
./autogen.sh
@@ -115,6 +117,11 @@ CXXFLAGS=-g; export CXXFLAGS
make CFLAGS="$RPM_OPT_FLAGS"
+#tweak the manual pages
+find -path "*/doc/*.1" -exec \
+ sed -i -e \
+ 's,/doc/oprofile/,/doc/oprofile-%{version}/,g' {} \;
+
%install
rm -rf ${RPM_BUILD_ROOT}
@@ -223,6 +230,10 @@ exit 0
/etc/ld.so.conf.d/*
%changelog
+* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
+- Allow timer mode to work.
+- Correct location for addditional files in man pages. Resolves: rhbz #508669
+
* Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-2
- Bump version and rebuild.
More information about the fedora-extras-commits
mailing list