Hello community,
here is the log from the commit of package oprofile for openSUSE:Factory
checked in at Thu Jul 30 22:54:26 CEST 2009.
--------
--- oprofile/oprofile.changes 2009-06-10 20:24:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/oprofile/oprofile.changes 2009-07-29 13:50:05.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Jul 29 13:49:06 CEST 2009 - jblunck@suse.de
+
+- Move libopagent1 to its own package.
+
+-------------------------------------------------------------------
+Wed Jul 29 12:06:30 CEST 2009 - jblunck@suse.de
+
+- Update to version 0.9.5-rc2.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
jvmpi.h
oprofile-0.9.4.diff
oprofile-0.9.4.tar.gz
oprofile-basename.diff
New:
----
oprofile-0.9.4-fixes.diff
oprofile-0.9.5-buildfixes.diff
oprofile-0.9.5-rc2.tar.bz2
oprofile.rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ oprofile.spec ++++++
--- /var/tmp/diff_new_pack.VsKOYC/_old 2009-07-30 22:42:39.000000000 +0200
+++ /var/tmp/diff_new_pack.VsKOYC/_new 2009-07-30 22:42:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package oprofile (Version 0.9.4)
+# spec file for package oprofile (Version 0.9.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,21 +18,21 @@
Name: oprofile
-BuildRequires: binutils-devel java2-devel-packages libxslt popt-devel qt3-devel update-desktop-files
+BuildRequires: binutils-devel fdupes java2-devel-packages libxslt popt-devel qt3-devel update-desktop-files
Url: http://oprofile.sourceforge.net/
License: GPL v2 or later
Group: Development/Tools/Other
AutoReqProv: on
PreReq: /usr/sbin/groupadd /usr/sbin/useradd
-Version: 0.9.4
-Release: 53
+Version: 0.9.5
+Release: 1
Summary: System-Wide Profiler for Linux Systems
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: %{name}-%{version}.tar.gz
+Source: %{name}-%{version}-rc2.tar.bz2
Source1: %{name}.desktop
-Source2: jvmpi.h
-Patch1: %{name}-%{version}.diff
-Patch2: oprofile-basename.diff
+Source2: %{name}.rpmlintrc
+Patch1: oprofile-0.9.5-buildfixes.diff
+Patch2: oprofile-0.9.4-fixes.diff
%description
OProfile is a system-wide profiler for Linux systems, capable of
@@ -67,9 +67,9 @@
%package devel
Summary: System-Wide Profiler for Linux Systems
Group: Development/Libraries/C and C++
-License: GPL v2 or later; LGPL v2.1 or later
+License: GPL v2 or later ; LGPL v2.1 or later
AutoReqProv: on
-Requires: oprofile = %{version}-%{release} binutils-devel
+Requires: libopagent1 = %{version}-%{release} binutils-devel
%description devel
OProfile is a system-wide profiler for Linux systems, capable of
@@ -102,13 +102,47 @@
Dave Jones
Bob Montgomery
+%package -n libopagent1
+Summary: System-Wide Profiler for Linux Systems
+Group: Development/Libraries/C and C++
+License: GPL v2 or later ; LGPL v2.1 or later
+AutoReqProv: on
+
+%description -n libopagent1
+OProfile is a system-wide profiler for Linux systems, capable of
+profiling all running code at low overhead. OProfile is released under
+the GNU GPL.
+
+It consists of a kernel module and a daemon for collecting sample data,
+and several post-profiling tools for turning data into information.
+
+OProfile leverages the CPU hardware performance counters to enable
+profiling of a wide variety of interesting statistics, which can also
+be used for basic time-spent profiling. All code is profiled: hardware
+and software interrupt handlers, kernel modules, the kernel, shared
+libraries, and applications (the only exception being the oprofile
+interrupt handler itself).
+
+OProfile is currently in alpha status; however it has proven stable
+over a large number of differing configurations. As always, there is no
+warranty.
+
+This package contains the files needed to develop JIT agents for other
+virtual machines.
+
+
+
+Authors:
+--------
+ John Levon
+ Philippe Elie
+ Dave Jones
+ Bob Montgomery
+
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc2
%patch1
%patch2 -p1
-mkdir -p java/include
-ln -s %_libdir/jvm/java/include/* java/include
-test -f java/include/jvmpi.h || ln -s %{S:2} java/include
%build
autoreconf -fi
@@ -121,14 +155,18 @@
%install
make DESTDIR=$RPM_BUILD_ROOT htmldir=%{_docdir}/oprofile install
%suse_update_desktop_file -i %name Development Profiling
+rm -vf $RPM_BUILD_ROOT%{_libdir}/libopagent.la
+# Hardlink duplicate files automatically (from package fdupes):
+# It doesn't save much, but it keeps rpmlint from breaking the package build.
+%fdupes $RPM_BUILD_ROOT
%pre
/usr/sbin/groupadd -r oprofile 2>/dev/null || :
/usr/sbin/useradd -r -g oprofile -d /var/lib/empty -s /bin/false -c "Special user account to be used by OProfile" oprofile 2>/dev/null || :
-%post -p /sbin/ldconfig
+%post -n libopagent1 -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun -n libopagent1 -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
@@ -138,8 +176,6 @@
/usr/bin/*
/usr/share/applications/*.desktop
/usr/share/oprofile
-%{_libdir}/*.so*
-%exclude %{_libdir}/libopagent.so
%{_mandir}/man1/*
%doc doc/oprofile.html doc/internals.html doc/opreport.xsd
%doc COPYING README TODO ChangeLog
@@ -148,7 +184,11 @@
%defattr(-,root,root)
/usr/include/*
%doc doc/op-jit-devel.html
-%{_libdir}/*.*a
+%{_libdir}/libopagent.a
%{_libdir}/libopagent.so
+%files -n libopagent1
+%defattr(-,root,root)
+%{_libdir}/*.so.1*
+
%changelog
++++++ oprofile-0.9.4-fixes.diff ++++++
---
agents/jvmpi/jvmpi_oprofile.cpp | 2 ++
libutil++/bfd_support.cpp | 3 +++
2 files changed, 5 insertions(+)
Index: b/agents/jvmpi/jvmpi_oprofile.cpp
===================================================================
--- a/agents/jvmpi/jvmpi_oprofile.cpp
+++ b/agents/jvmpi/jvmpi_oprofile.cpp
@@ -24,11 +24,13 @@
*
*/
+#include
#include <iostream>
#include <map>
#include <string>
#include <stdexcept>
#include <cerrno>
+#include <cstring>
extern "C" {
#include
Index: b/libutil++/bfd_support.cpp
===================================================================
--- a/libutil++/bfd_support.cpp
+++ b/libutil++/bfd_support.cpp
@@ -370,6 +370,9 @@ bool interesting_symbol(asymbol * sym)
if (!(sym->section->flags & SEC_LOAD))
return false;
+ if (sym->flags & BSF_SECTION_SYM)
+ return false;
+
return true;
}
++++++ oprofile-0.9.5-buildfixes.diff ++++++
---
Makefile.am | 1 +
agents/jvmpi/Makefile.am | 4 ++--
agents/jvmti/Makefile.am | 4 ++--
libopagent/Makefile.am | 4 ++--
m4/builtinexpect.m4 | 2 +-
m4/mallocattribute.m4 | 4 ++--
utils/opcontrol | 13 +++++++++++--
7 files changed, 21 insertions(+), 11 deletions(-)
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -25,6 +25,7 @@ SUBDIRS = \
+AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
# The module will not build under distcheck
Index: agents/jvmpi/Makefile.am
===================================================================
--- agents/jvmpi/Makefile.am.orig
+++ agents/jvmpi/Makefile.am
@@ -1,6 +1,6 @@
-pkglib_LTLIBRARIES = libjvmpi_oprofile.la
+lib_LTLIBRARIES = libjvmpi_oprofile.la
-libjvmpi_oprofile_la_CXXFLAGS = -W -Wall -fPIC
+libjvmpi_oprofile_la_LDFLAGS = -module -avoid-version
libjvmpi_oprofile_la_SOURCES = jvmpi_oprofile.cpp
Index: agents/jvmti/Makefile.am
===================================================================
--- agents/jvmti/Makefile.am.orig
+++ agents/jvmti/Makefile.am
@@ -1,8 +1,8 @@
AM_CFLAGS = @OP_CFLAGS@
-pkglib_LTLIBRARIES = libjvmti_oprofile.la
+lib_LTLIBRARIES = libjvmti_oprofile.la
-libjvmti_oprofile_la_CFLAGS = $(AM_CFLAGS) -fPIC
+libjvmti_oprofile_la_LDFLAGS = -module -avoid-version
libjvmti_oprofile_la_LIBADD = ../../libopagent/libopagent.la
Index: libopagent/Makefile.am
===================================================================
--- libopagent/Makefile.am.orig
+++ libopagent/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libopagent.la
+lib_LTLIBRARIES = libopagent.la
# install opagent.h to include directory
include_HEADERS = opagent.h
@@ -10,7 +10,7 @@ libopagent_la_SOURCES = opagent.c \
EXTRA_DIST = opagent_symbols.ver
-libopagent_la_CFLAGS = -fPIC -I ${top_srcdir}/libop -I ${top_srcdir}/libutil
+libopagent_la_CPPFLAGS = -I ${top_srcdir}/libop -I ${top_srcdir}/libutil
libopagent_la_LIBADD = $(BFD_LIBS)
# Do not increment the major version for this library except to
Index: m4/builtinexpect.m4
===================================================================
--- m4/builtinexpect.m4.orig
+++ m4/builtinexpect.m4
@@ -5,7 +5,7 @@ AC_MSG_CHECKING([whether __builtin_expec
SAVE_CFLAGS=$CFLAGS
CFLAGS="-Werror $CFLAGS"
AC_TRY_LINK(,[
-int i;
+int i = 0;
if (__builtin_expect(i, 0)) { }
],
AC_MSG_RESULT([yes]); EXTRA_CFLAGS_MODULE="$EXTRA_CFLAGS_MODULE -DEXPECT_OK",
Index: m4/mallocattribute.m4
===================================================================
--- m4/mallocattribute.m4.orig
+++ m4/mallocattribute.m4
@@ -4,9 +4,9 @@ AC_DEFUN([AX_MALLOC_ATTRIBUTE],
AC_MSG_CHECKING([whether malloc attribute is understood])
SAVE_CFLAGS=$CFLAGS
CFLAGS="-Werror $CFLAGS"
-AC_TRY_COMPILE(,[
+AC_TRY_COMPILE([
void monkey() __attribute__((malloc));
-],AC_MSG_RESULT([yes]); AC_DEFINE(MALLOC_ATTRIBUTE_OK, 1, [whether malloc attribute is understood]), AC_MSG_RESULT([no]))
+],,AC_MSG_RESULT([yes]); AC_DEFINE(MALLOC_ATTRIBUTE_OK, 1, [whether malloc attribute is understood]), AC_MSG_RESULT([no]))
CFLAGS=$SAVE_CFLAGS
]
)
Index: utils/opcontrol
===================================================================
--- utils/opcontrol.orig
+++ utils/opcontrol
@@ -481,10 +481,19 @@ get_image_range()
exit 1
fi
+ kernel_file=$FILE_IMAGE
+ case $(file -L $kernel_file) in
+ *"gzip compressed"*)
+ kernel_file=$(mktemp /tmp/opcXXXXXX) || exit 1
+ trap "rm -f $kernel_file" EXIT
+ gzip -cd $FILE_IMAGE > $kernel_file
+ ;;
+ esac
+
# start at the start of .text, and end at _etext
- range_info=`objdump -h $FILE_IMAGE 2>/dev/null | grep " .text "`
+ range_info=`objdump -h $kernel_file 2>/dev/null | grep " .text "`
tmp1=`echo $range_info | awk '{print $4}'`
- tmp2=`objdump -t $FILE_IMAGE 2>/dev/null | grep "_etext$" | awk '{ print $1 }'`
+ tmp2=`objdump -t $kernel_file 2>/dev/null | grep "_etext$" | awk '{ print $1 }'`
if test -z "$tmp1" -o -z "$tmp2"; then
echo "The specified file $FILE_IMAGE does not seem to be valid" >&2
++++++ oprofile.rpmlintrc ++++++
# This line is mandatory to access the configuration functions
from Config import *
# Because reference via bfd_abort()
addFilter ("oprofile.*shared-lib-calls-exit")
# Because the library is called libopagent1
addFilter ("oprofile-devel.*no-dependency-on")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org