From cfaa068c90fc746a690ae6270306782bea0187a9 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Wed, 16 Jul 2008 23:06:50 -0400 Subject: version bump to 0.7.1 --- .cvsignore | 4 - .gitignore | 1 - ChangeLog | 8 ++ Makefile.am | 3 +- Makefile.in | 11 +- NEWS | 3 + configure | 23 ++-- configure.ac | 6 +- systemtap.spec | 314 +++++++++++++++++++++++++++++++++++++++++++++++++ systemtap.spec.in | 311 ------------------------------------------------ testsuite/configure | 20 ++-- testsuite/configure.ac | 2 +- 12 files changed, 357 insertions(+), 349 deletions(-) delete mode 100644 .cvsignore create mode 100644 systemtap.spec delete mode 100644 systemtap.spec.in diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 4bfb84ef..00000000 --- a/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -*~ -autom4te.* cscope*out Makefile config.h config.log config.status *.[158] -.deps loc2c-test stamp-h1 stap staprun systemtap.spec testresults -stapio stap_merge diff --git a/.gitignore b/.gitignore index 961fba32..ad272dc6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ loc2c-test stamp-h1 stap staprun -systemtap.spec testresults stapio stap_merge diff --git a/ChangeLog b/ChangeLog index 374e6fd8..c1765617 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-16 Frank Ch. Eigler + + * configure.ac: Bumped version to 0.7.1. + * systemtap.spec: Renamed from systemtap.spec.in; don't autoconf it + just on account of @VERSION@. + * Makefile.am (EXTRA_DIST): Distribute it. + * Makefile.in, configure, testsuite/configure: Regenerated. + 2008-07-16 Dave Brolley * Makefile.am (EXTRA_DIST): Add stap-client, stap-server, stap-serverd. diff --git a/Makefile.am b/Makefile.am index c6697618..3f619584 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,7 +155,8 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \ testsuite systemtap.spec runtime tapset \ dwarf_wrappers.h \ git_version.h git_version.sh \ - stap-client stap-server stap-serverd + stap-client stap-server stap-serverd \ + systemtap.spec EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples EXAMPLE_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples diff --git a/Makefile.in b/Makefile.in index d6391cc7..cc8d4fd3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,7 +49,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/config.in $(srcdir)/stap.1.in $(srcdir)/stapex.5.in \ $(srcdir)/stapfuncs.5.in $(srcdir)/stapprobes.5.in \ $(srcdir)/staprun.8.in $(srcdir)/stapvars.5.in \ - $(srcdir)/systemtap.spec.in $(top_srcdir)/configure \ + $(top_srcdir)/configure \ $(top_srcdir)/man/stapprobes.iosched.5.in \ $(top_srcdir)/man/stapprobes.netdev.5.in \ $(top_srcdir)/man/stapprobes.nfs.5.in \ @@ -72,8 +72,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = systemtap.spec stap.1 stapprobes.5 stapfuncs.5 \ - stapvars.5 stapex.5 staprun.8 man/stapprobes.iosched.5 \ +CONFIG_CLEAN_FILES = stap.1 stapprobes.5 stapfuncs.5 stapvars.5 \ + stapex.5 staprun.8 man/stapprobes.iosched.5 \ man/stapprobes.netdev.5 man/stapprobes.nfs.5 \ man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 \ man/stapprobes.process.5 man/stapprobes.rpc.5 \ @@ -334,7 +334,8 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \ testsuite systemtap.spec runtime tapset \ dwarf_wrappers.h \ git_version.h git_version.sh \ - stap-client stap-server stap-serverd + stap-client stap-server stap-serverd \ + systemtap.spec EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples EXAMPLE_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples @@ -419,8 +420,6 @@ $(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -systemtap.spec: $(top_builddir)/config.status $(srcdir)/systemtap.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ stap.1: $(top_builddir)/config.status $(srcdir)/stap.1.in cd $(top_builddir) && $(SHELL) ./config.status $@ stapprobes.5: $(top_builddir)/config.status $(srcdir)/stapprobes.5.in diff --git a/NEWS b/NEWS index 103bd3c4..65af9271 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +* What's new + + * What's new in version 0.7 - .statement("func@file:*") and .statement("func@file:M-N") probes are now diff --git a/configure b/configure index 32a850cb..be952838 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for systemtap 0.7. +# Generated by GNU Autoconf 2.61 for systemtap 0.7.1. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='systemtap' PACKAGE_TARNAME='systemtap' -PACKAGE_VERSION='0.7' -PACKAGE_STRING='systemtap 0.7' +PACKAGE_VERSION='0.7.1' +PACKAGE_STRING='systemtap 0.7.1' PACKAGE_BUGREPORT='systemtap@sources.redhat.com' # Factoring default headers for most tests. @@ -1243,7 +1243,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures systemtap 0.7 to adapt to many kinds of systems. +\`configure' configures systemtap 0.7.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1309,7 +1309,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of systemtap 0.7:";; + short | recursive ) echo "Configuration of systemtap 0.7.1:";; esac cat <<\_ACEOF @@ -1420,7 +1420,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -systemtap configure 0.7 +systemtap configure 0.7.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1434,7 +1434,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by systemtap $as_me 0.7, which was +It was created by systemtap $as_me 0.7.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2126,7 +2126,7 @@ fi # Define the identity of the package. PACKAGE='systemtap' - VERSION='0.7' + VERSION='0.7.1' cat >>confdefs.h <<_ACEOF @@ -7190,7 +7190,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h:config.in" -ac_config_files="$ac_config_files Makefile doc/Makefile systemtap.spec stap.1 stapprobes.5 stapfuncs.5 stapvars.5 stapex.5 staprun.8 man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5" +ac_config_files="$ac_config_files Makefile doc/Makefile stap.1 stapprobes.5 stapfuncs.5 stapvars.5 stapex.5 staprun.8 man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5" subdirs="$subdirs testsuite" @@ -7647,7 +7647,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by systemtap $as_me 0.7, which was +This file was extended by systemtap $as_me 0.7.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7700,7 +7700,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -systemtap config.status 0.7 +systemtap config.status 0.7.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -7818,7 +7818,6 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "systemtap.spec") CONFIG_FILES="$CONFIG_FILES systemtap.spec" ;; "stap.1") CONFIG_FILES="$CONFIG_FILES stap.1" ;; "stapprobes.5") CONFIG_FILES="$CONFIG_FILES stapprobes.5" ;; "stapfuncs.5") CONFIG_FILES="$CONFIG_FILES stapfuncs.5" ;; diff --git a/configure.ac b/configure.ac index c7338f80..6728ace7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl configure.ac --- autoconf input file for systemtap dnl Process this file with autoconf to produce a configure script. -AC_INIT([systemtap], 0.7, systemtap@sources.redhat.com, systemtap) -dnl ^^^ see also NEWS, testsuite/configure.ac +AC_INIT([systemtap], 0.7.1, systemtap@sources.redhat.com, systemtap) +dnl ^^^^^ see also NEWS, systemtap.spec, testsuite/configure.ac AC_PREREQ(2.59) AM_INIT_AUTOMAKE @@ -231,7 +231,7 @@ AC_CHECK_HEADERS([tr1/unordered_map]) AC_LANG_POP(C++) AC_CONFIG_HEADERS([config.h:config.in]) -AC_CONFIG_FILES(Makefile doc/Makefile systemtap.spec stap.1 stapprobes.5 stapfuncs.5 stapvars.5 stapex.5 staprun.8 man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5) +AC_CONFIG_FILES(Makefile doc/Makefile stap.1 stapprobes.5 stapfuncs.5 stapvars.5 stapex.5 staprun.8 man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5) AC_CONFIG_SUBDIRS(testsuite) AC_OUTPUT diff --git a/systemtap.spec b/systemtap.spec new file mode 100644 index 00000000..2538cead --- /dev/null +++ b/systemtap.spec @@ -0,0 +1,314 @@ +%define release 1 +%define with_sqlite 1 +%define with_docs 1 +%define with_crash 0 +%define with_bundled_elfutils 0 +%define elfutils_version 0.127 + +Name: systemtap +Version: 0.7.1 # see also configure.ac +Release: %{release}%{?dist} +Summary: Instrumentation System +Group: Development/System +License: GPLv2+ +URL: http://sourceware.org/systemtap/ +Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: kernel >= 2.6.9-11 +BuildRequires: libcap-devel +%if %{with_sqlite} +BuildRequires: sqlite-devel +Requires: sqlite +%endif +%if %{with_crash} +BuildRequires: crash-devel zlib-devel +%endif +# Requires: kernel-devel +# or is that kernel-smp-devel? kernel-hugemem-devel? +Requires: gcc make +# Suggest: kernel-debuginfo +Requires: systemtap-runtime = %{version}-%{release} + +%if %{with_bundled_elfutils} +Source1: elfutils-%{elfutils_version}.tar.gz +Patch1: elfutils-portability.patch +%define setup_elfutils -a1 +%else +BuildRequires: elfutils-devel >= %{elfutils_version} +%endif +%if %{with_crash} +Requires: crash +%endif + +%if %{with_docs} +BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html +%endif + +%description +SystemTap is an instrumentation system for systems running Linux 2.6. +Developers can write instrumentation to collect data on the operation +of the system. + +%package runtime +Summary: Instrumentation System Runtime +Group: Development/System +License: GPLv2+ +URL: http://sourceware.org/systemtap/ +Requires: kernel >= 2.6.9-11 +Requires(pre): shadow-utils + +%description runtime +SystemTap runtime is the runtime component of an instrumentation +system for systems running Linux 2.6. Developers can write +instrumentation to collect data on the operation of the system. + +%package testsuite +Summary: Instrumentation System Testsuite +Group: Development/System +License: GPLv2+ +URL: http://sourceware.org/systemtap/ +Requires: systemtap dejagnu + +%description testsuite +The testsuite allows testing of the entire SystemTap toolchain +without having to rebuild from sources. + +%prep +%setup -q %{?setup_elfutils} + +%if %{with_bundled_elfutils} +cd elfutils-%{elfutils_version} +%patch1 -p1 +sleep 1 +find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch +sleep 1 +find . \( -name configure -o -name config.h.in \) -print | xargs touch +cd .. +%endif + +%build + +%if %{with_bundled_elfutils} +# Build our own copy of elfutils. +%define elfutils_config --with-elfutils=elfutils-%{elfutils_version} + +# We have to prevent the standard dependency generation from identifying +# our private elfutils libraries in our provides and requires. +%define _use_internal_dependency_generator 0 +%define filter_eulibs() /bin/sh -c "%{1} | sed '/libelf/d;/libdw/d;/libebl/d'" +%define __find_provides %{filter_eulibs /usr/lib/rpm/find-provides} +%define __find_requires %{filter_eulibs /usr/lib/rpm/find-requires} + +# This will be needed for running stap when not installed, for the test suite. +%define elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils +%endif + +# Enable/disable the sqlite coverage testing support +%if %{with_sqlite} +%define sqlite_config --enable-sqlite +%else +%define sqlite_config --disable-sqlite +%endif + +# Enable/disable the crash extension +%if %{with_crash} +%define crash_config --enable-crash +%else +%define crash_config --disable-crash +%endif + +%if %{with_docs} +%define docs_config --enable-docs +%else +%define docs_config --disable-docs +%endif + + + +%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} +make %{?_smp_mflags} + +%install +rm -rf ${RPM_BUILD_ROOT} +make DESTDIR=$RPM_BUILD_ROOT install + +# We want the examples in the special doc dir, not the generoc doc install dir. +mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples + +# Fix paths in the example & testsuite scripts +find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@' + +# To avoid perl dependency, make perl sample script non-executable +chmod -x examples/samples/kmalloc-top + +# Because "make install" may install staprun with mode 04111, the +# post-processing programs rpmbuild runs won't be able to read it. +# So, we change permissions so that they can read it. We'll set the +# permissions back to 04111 in the %files section below. +chmod 755 $RPM_BUILD_ROOT%{_bindir}/staprun + +# Copy over the testsuite +cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap + +#%if %{with_docs} +# We want the manuals in the special doc dir, not the generic doc install dir. +mkdir docs.installed +mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/ +#%endif + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%pre runtime +getent group stapdev >/dev/null || groupadd -r stapdev +getent group stapusr >/dev/null || groupadd -r stapusr +exit 0 + +%files +%defattr(-,root,root) + +%doc README AUTHORS NEWS COPYING examples +%if %{with_docs} +%doc docs.installed/*.pdf +%endif + +%{_bindir}/stap +%{_mandir}/man1/* +%{_mandir}/man5/* + +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/runtime +%{_datadir}/%{name}/tapset + +%if %{with_bundled_elfutils} || %{with_crash} +%dir %{_libdir}/%{name} +%endif +%if %{with_bundled_elfutils} +%{_libdir}/%{name}/lib*.so* +%endif +%if %{with_crash} +%{_libdir}/%{name}/staplog.so* +%endif + +%files runtime +%defattr(-,root,root) +%attr(4111,root,root) %{_bindir}/staprun +%{_libexecdir}/%{name} +%{_mandir}/man8/* + +%doc README AUTHORS NEWS COPYING + +%files testsuite +%defattr(-,root,root) +%{_datadir}/%{name}/testsuite + + +%changelog +* Tue Jul 15 2008 Frank Ch. Eigler - 0.7-1 +- Upstream release. + +* Fri Feb 1 2008 Frank Ch. Eigler - 0.6.1-3 +- Add zlib-devel to buildreq; missing from crash-devel +- Process testsuite .stp files for #!stap->#!/usr/bin/stap + +* Fri Jan 18 2008 Frank Ch. Eigler - 0.6.1-1 +- Add crash-devel buildreq to build staplog.so crash(8) module. +- Many robustness & functionality improvements: + +* Wed Dec 5 2007 Will Cohen - 0.6-2 +- Correct Source to point to location contain code. + +* Thu Aug 9 2007 David Smith - 0.6-1 +- Bumped version, added libcap-devel BuildRequires. + +* Wed Jul 11 2007 Will Cohen - 0.5.14-2 +- Fix Requires and BuildRequires for sqlite. + +* Tue Jul 2 2007 Frank Ch. Eigler - 0.5.14-1 +- Many robustness improvements: 1117, 1134, 1305, 1307, 1570, 1806, + 2033, 2116, 2224, 2339, 2341, 2406, 2426, 2438, 2583, 3037, + 3261, 3282, 3331, 3428 3519, 3545, 3625, 3648, 3880, 3888, 3911, + 3952, 3965, 4066, 4071, 4075, 4078, 4081, 4096, 4119, 4122, 4127, + 4146, 4171, 4179, 4183, 4221, 4224, 4254, 4281, 4319, 4323, 4326, + 4329, 4332, 4337, 4415, 4432, 4444, 4445, 4458, 4467, 4470, 4471, + 4518, 4567, 4570, 4579, 4589, 4609, 4664 + +* Mon Mar 26 2007 Frank Ch. Eigler - 0.5.13-1 +- An emergency / preliminary refresh, mainly for compatibility + with 2.6.21-pre kernels. + +* Mon Jan 1 2007 Frank Ch. Eigler - 0.5.12-1 +- Many changes, see NEWS file. + +* Tue Sep 26 2006 David Smith - 0.5.10-1 +- Added 'systemtap-runtime' subpackage. + +* Wed Jul 19 2006 Roland McGrath - 0.5.9-1 +- PRs 2669, 2913 + +* Fri Jun 16 2006 Roland McGrath - 0.5.8-1 +- PRs 2627, 2520, 2228, 2645 + +* Fri May 5 2006 Frank Ch. Eigler - 0.5.7-1 +- PRs 2511 2453 2307 1813 1944 2497 2538 2476 2568 1341 2058 2220 2437 + 1326 2014 2599 2427 2438 2465 1930 2149 2610 2293 2634 2506 2433 + +* Tue Apr 4 2006 Roland McGrath - 0.5.5-1 +- Many changes, affected PRs include: 2068, 2293, 1989, 2334, + 1304, 2390, 2425, 953. + +* Wed Feb 1 2006 Frank Ch. Eigler - 0.5.4-1 +- PRs 1916, 2205, 2142, 2060, 1379 + +* Mon Jan 16 2006 Roland McGrath - 0.5.3-1 +- Many changes, affected PRs include: 2056, 1144, 1379, 2057, + 2060, 1972, 2140, 2148 + +* Mon Dec 19 2005 Roland McGrath - 0.5.2-1 +- Fixed build with gcc 4.1, various tapset changes. + +* Wed Dec 7 2005 Roland McGrath - 0.5.1-1 +- elfutils update, build changes + +* Fri Dec 02 2005 Frank Ch. Eigler - 0.5-1 +- Many fixes and improvements: 1425, 1536, 1505, 1380, 1329, 1828, 1271, + 1339, 1340, 1345, 1837, 1917, 1903, 1336, 1868, 1594, 1564, 1276, 1295 + +* Mon Oct 31 2005 Roland McGrath - 0.4.2-1 +- Many fixes and improvements: PRs 1344, 1260, 1330, 1295, 1311, 1368, + 1182, 1131, 1332, 1366, 1456, 1271, 1338, 1482, 1477, 1194. + +* Wed Sep 14 2005 Roland McGrath - 0.4.1-1 +- Many fixes and improvements since 0.2.2; relevant PRs include: + 1122, 1134, 1155, 1172, 1174, 1175, 1180, 1186, 1187, 1191, 1193, 1195, + 1197, 1205, 1206, 1209, 1213, 1244, 1257, 1258, 1260, 1265, 1268, 1270, + 1289, 1292, 1306, 1335, 1257 + +* Wed Sep 7 2005 Frank Ch. Eigler +- Bump version. + +* Wed Aug 16 2005 Frank Ch. Eigler +- Bump version. + +* Wed Aug 3 2005 Martin Hunt - 0.2.2-1 +- Add directory /var/cache/systemtap +- Add stp_check to /usr/libexec/systemtap + +* Wed Aug 3 2005 Roland McGrath - 0.2.1-1 +- New version 0.2.1, various fixes. + +* Fri Jul 29 2005 Roland McGrath - 0.2-1 +- New version 0.2, requires elfutils 0.111 + +* Mon Jul 25 2005 Roland McGrath +- Clean up spec file, build bundled elfutils. + +* Thu Jul 21 2005 Martin Hunt +- Set Version to use version from autoconf. +- Fix up some of the path names. +- Add Requires and BuildRequires. + +* Wed Jul 19 2005 Will Cohen +- Initial creation of RPM. diff --git a/systemtap.spec.in b/systemtap.spec.in deleted file mode 100644 index 1fdd65a4..00000000 --- a/systemtap.spec.in +++ /dev/null @@ -1,311 +0,0 @@ -%define release 1 -%define with_sqlite 1 -%define with_docs 1 -%define with_crash 0 -%define with_bundled_elfutils 0 -%define elfutils_version 0.127 - -Name: systemtap -Version: @VERSION@ -Release: %{release}%{?dist} -Summary: Instrumentation System -Group: Development/System -License: GPLv2+ -URL: http://sourceware.org/systemtap/ -Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Requires: kernel >= 2.6.9-11 -BuildRequires: libcap-devel -%if %{with_sqlite} -BuildRequires: sqlite-devel -Requires: sqlite -%endif -%if %{with_crash} -BuildRequires: crash-devel zlib-devel -%endif -# Requires: kernel-devel -# or is that kernel-smp-devel? kernel-hugemem-devel? -Requires: gcc make -# Suggest: kernel-debuginfo -Requires: systemtap-runtime = %{version}-%{release} - -%if %{with_bundled_elfutils} -Source1: elfutils-%{elfutils_version}.tar.gz -Patch1: elfutils-portability.patch -%define setup_elfutils -a1 -%else -BuildRequires: elfutils-devel >= %{elfutils_version} -%endif -%if %{with_crash} -Requires: crash -%endif - -%if %{with_docs} -BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html -%endif - -%description -SystemTap is an instrumentation system for systems running Linux 2.6. -Developers can write instrumentation to collect data on the operation -of the system. - -%package runtime -Summary: Instrumentation System Runtime -Group: Development/System -License: GPLv2+ -URL: http://sourceware.org/systemtap/ -Requires: kernel >= 2.6.9-11 -Requires(pre): shadow-utils - -%description runtime -SystemTap runtime is the runtime component of an instrumentation -system for systems running Linux 2.6. Developers can write -instrumentation to collect data on the operation of the system. - -%package testsuite -Summary: Instrumentation System Testsuite -Group: Development/System -License: GPLv2+ -URL: http://sourceware.org/systemtap/ -Requires: systemtap dejagnu - -%description testsuite -The testsuite allows testing of the entire SystemTap toolchain -without having to rebuild from sources. - -%prep -%setup -q %{?setup_elfutils} - -%if %{with_bundled_elfutils} -cd elfutils-%{elfutils_version} -%patch1 -p1 -sleep 1 -find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch -sleep 1 -find . \( -name configure -o -name config.h.in \) -print | xargs touch -cd .. -%endif - -%build - -%if %{with_bundled_elfutils} -# Build our own copy of elfutils. -%define elfutils_config --with-elfutils=elfutils-%{elfutils_version} - -# We have to prevent the standard dependency generation from identifying -# our private elfutils libraries in our provides and requires. -%define _use_internal_dependency_generator 0 -%define filter_eulibs() /bin/sh -c "%{1} | sed '/libelf/d;/libdw/d;/libebl/d'" -%define __find_provides %{filter_eulibs /usr/lib/rpm/find-provides} -%define __find_requires %{filter_eulibs /usr/lib/rpm/find-requires} - -# This will be needed for running stap when not installed, for the test suite. -%define elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils -%endif - -# Enable/disable the sqlite coverage testing support -%if %{with_sqlite} -%define sqlite_config --enable-sqlite -%else -%define sqlite_config --disable-sqlite -%endif - -# Enable/disable the crash extension -%if %{with_crash} -%define crash_config --enable-crash -%else -%define crash_config --disable-crash -%endif - -%if %{with_docs} -%define docs_config --enable-docs -%else -%define docs_config --disable-docs -%endif - - - -%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} -make %{?_smp_mflags} - -%install -rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=$RPM_BUILD_ROOT install - -# We want the examples in the special doc dir, not the generoc doc install dir. -mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples - -# Fix paths in the example & testsuite scripts -find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@' - -# To avoid perl dependency, make perl sample script non-executable -chmod -x examples/samples/kmalloc-top - -# Because "make install" may install staprun with mode 04111, the -# post-processing programs rpmbuild runs won't be able to read it. -# So, we change permissions so that they can read it. We'll set the -# permissions back to 04111 in the %files section below. -chmod 755 $RPM_BUILD_ROOT%{_bindir}/staprun - -# Copy over the testsuite -cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap - -#%if %{with_docs} -# We want the manuals in the special doc dir, not the generic doc install dir. -mkdir docs.installed -mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/ -#%endif - -%clean -rm -rf ${RPM_BUILD_ROOT} - -%pre runtime -getent group stapdev >/dev/null || groupadd -r stapdev -getent group stapusr >/dev/null || groupadd -r stapusr -exit 0 - -%files -%defattr(-,root,root) - -%doc README AUTHORS NEWS COPYING examples -%if %{with_docs} -%doc docs.installed/*.pdf -%endif - -%{_bindir}/stap -%{_mandir}/man1/* -%{_mandir}/man5/* - -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/runtime -%{_datadir}/%{name}/tapset - -%if %{with_bundled_elfutils} || %{with_crash} -%dir %{_libdir}/%{name} -%endif -%if %{with_bundled_elfutils} -%{_libdir}/%{name}/lib*.so* -%endif -%if %{with_crash} -%{_libdir}/%{name}/staplog.so* -%endif - -%files runtime -%defattr(-,root,root) -%attr(4111,root,root) %{_bindir}/staprun -%{_libexecdir}/%{name} -%{_mandir}/man8/* - -%doc README AUTHORS NEWS COPYING - -%files testsuite -%defattr(-,root,root) -%{_datadir}/%{name}/testsuite - - -%changelog -* Fri Feb 1 2008 Frank Ch. Eigler - 0.6.1-3 -- Add zlib-devel to buildreq; missing from crash-devel -- Process testsuite .stp files for #!stap->#!/usr/bin/stap - -* Fri Jan 18 2008 Frank Ch. Eigler - 0.6.1-1 -- Add crash-devel buildreq to build staplog.so crash(8) module. -- Many robustness & functionality improvements: - -* Wed Dec 5 2007 Will Cohen - 0.6-2 -- Correct Source to point to location contain code. - -* Thu Aug 9 2007 David Smith - 0.6-1 -- Bumped version, added libcap-devel BuildRequires. - -* Wed Jul 11 2007 Will Cohen - 0.5.14-2 -- Fix Requires and BuildRequires for sqlite. - -* Tue Jul 2 2007 Frank Ch. Eigler - 0.5.14-1 -- Many robustness improvements: 1117, 1134, 1305, 1307, 1570, 1806, - 2033, 2116, 2224, 2339, 2341, 2406, 2426, 2438, 2583, 3037, - 3261, 3282, 3331, 3428 3519, 3545, 3625, 3648, 3880, 3888, 3911, - 3952, 3965, 4066, 4071, 4075, 4078, 4081, 4096, 4119, 4122, 4127, - 4146, 4171, 4179, 4183, 4221, 4224, 4254, 4281, 4319, 4323, 4326, - 4329, 4332, 4337, 4415, 4432, 4444, 4445, 4458, 4467, 4470, 4471, - 4518, 4567, 4570, 4579, 4589, 4609, 4664 - -* Mon Mar 26 2007 Frank Ch. Eigler - 0.5.13-1 -- An emergency / preliminary refresh, mainly for compatibility - with 2.6.21-pre kernels. - -* Mon Jan 1 2007 Frank Ch. Eigler - 0.5.12-1 -- Many changes, see NEWS file. - -* Tue Sep 26 2006 David Smith - 0.5.10-1 -- Added 'systemtap-runtime' subpackage. - -* Wed Jul 19 2006 Roland McGrath - 0.5.9-1 -- PRs 2669, 2913 - -* Fri Jun 16 2006 Roland McGrath - 0.5.8-1 -- PRs 2627, 2520, 2228, 2645 - -* Fri May 5 2006 Frank Ch. Eigler - 0.5.7-1 -- PRs 2511 2453 2307 1813 1944 2497 2538 2476 2568 1341 2058 2220 2437 - 1326 2014 2599 2427 2438 2465 1930 2149 2610 2293 2634 2506 2433 - -* Tue Apr 4 2006 Roland McGrath - 0.5.5-1 -- Many changes, affected PRs include: 2068, 2293, 1989, 2334, - 1304, 2390, 2425, 953. - -* Wed Feb 1 2006 Frank Ch. Eigler - 0.5.4-1 -- PRs 1916, 2205, 2142, 2060, 1379 - -* Mon Jan 16 2006 Roland McGrath - 0.5.3-1 -- Many changes, affected PRs include: 2056, 1144, 1379, 2057, - 2060, 1972, 2140, 2148 - -* Mon Dec 19 2005 Roland McGrath - 0.5.2-1 -- Fixed build with gcc 4.1, various tapset changes. - -* Wed Dec 7 2005 Roland McGrath - 0.5.1-1 -- elfutils update, build changes - -* Fri Dec 02 2005 Frank Ch. Eigler - 0.5-1 -- Many fixes and improvements: 1425, 1536, 1505, 1380, 1329, 1828, 1271, - 1339, 1340, 1345, 1837, 1917, 1903, 1336, 1868, 1594, 1564, 1276, 1295 - -* Mon Oct 31 2005 Roland McGrath - 0.4.2-1 -- Many fixes and improvements: PRs 1344, 1260, 1330, 1295, 1311, 1368, - 1182, 1131, 1332, 1366, 1456, 1271, 1338, 1482, 1477, 1194. - -* Wed Sep 14 2005 Roland McGrath - 0.4.1-1 -- Many fixes and improvements since 0.2.2; relevant PRs include: - 1122, 1134, 1155, 1172, 1174, 1175, 1180, 1186, 1187, 1191, 1193, 1195, - 1197, 1205, 1206, 1209, 1213, 1244, 1257, 1258, 1260, 1265, 1268, 1270, - 1289, 1292, 1306, 1335, 1257 - -* Wed Sep 7 2005 Frank Ch. Eigler -- Bump version. - -* Wed Aug 16 2005 Frank Ch. Eigler -- Bump version. - -* Wed Aug 3 2005 Martin Hunt - 0.2.2-1 -- Add directory /var/cache/systemtap -- Add stp_check to /usr/libexec/systemtap - -* Wed Aug 3 2005 Roland McGrath - 0.2.1-1 -- New version 0.2.1, various fixes. - -* Fri Jul 29 2005 Roland McGrath - 0.2-1 -- New version 0.2, requires elfutils 0.111 - -* Mon Jul 25 2005 Roland McGrath -- Clean up spec file, build bundled elfutils. - -* Thu Jul 21 2005 Martin Hunt -- Set Version to use version from autoconf. -- Fix up some of the path names. -- Add Requires and BuildRequires. - -* Wed Jul 19 2005 Will Cohen -- Initial creation of RPM. diff --git a/testsuite/configure b/testsuite/configure index 93494726..a3d40ad8 100755 --- a/testsuite/configure +++ b/testsuite/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for systemtap 0.7. +# Generated by GNU Autoconf 2.61 for systemtap 0.7.1. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='systemtap' PACKAGE_TARNAME='systemtap' -PACKAGE_VERSION='0.7' -PACKAGE_STRING='systemtap 0.7' +PACKAGE_VERSION='0.7.1' +PACKAGE_STRING='systemtap 0.7.1' PACKAGE_BUGREPORT='systemtap@sources.redhat.com' ac_subst_vars='SHELL @@ -1149,7 +1149,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures systemtap 0.7 to adapt to many kinds of systems. +\`configure' configures systemtap 0.7.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1215,7 +1215,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of systemtap 0.7:";; + short | recursive ) echo "Configuration of systemtap 0.7.1:";; esac cat <<\_ACEOF @@ -1291,7 +1291,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -systemtap configure 0.7 +systemtap configure 0.7.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1305,7 +1305,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by systemtap $as_me 0.7, which was +It was created by systemtap $as_me 0.7.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1997,7 +1997,7 @@ fi # Define the identity of the package. PACKAGE='systemtap' - VERSION='0.7' + VERSION='0.7.1' cat >>confdefs.h <<_ACEOF @@ -2617,7 +2617,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by systemtap $as_me 0.7, which was +This file was extended by systemtap $as_me 0.7.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2660,7 +2660,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -systemtap config.status 0.7 +systemtap config.status 0.7.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/testsuite/configure.ac b/testsuite/configure.ac index 0fd78fe7..5b149937 100644 --- a/testsuite/configure.ac +++ b/testsuite/configure.ac @@ -1,7 +1,7 @@ dnl configure.ac --- autoconf input file for systemtap testsuite dnl Process this file with autoconf to produce a configure script. -AC_INIT([systemtap], 0.7, systemtap@sources.redhat.com, systemtap) +AC_INIT([systemtap], 0.7.1, systemtap@sources.redhat.com, systemtap) AC_PREREQ(2.59) AC_CONFIG_AUX_DIR(..) -- cgit