Compare commits

...

9 Commits
master ... f9

Author SHA1 Message Date
Fedora Release Engineering 2a5100332b dist-git conversion 2010-07-29 13:46:39 +00:00
Bill Nottingham 95a5ad208a Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:47:46 +00:00
Josh Stone 0373261bbf upstream release 0.9.8 2009-06-12 00:35:24 +00:00
Josh Stone b95988b95a upstream release 0.9.7 2009-04-24 01:13:04 +00:00
Josh Stone 997e0c97e6 upstream release 2009-03-27 17:49:57 +00:00
fche 4674fef3d1 upstream release 2009-02-19 18:35:51 +00:00
fche e9d52aa68c upstream refresh 2008-11-13 21:24:02 +00:00
fche ed47b3e9f9 v0.7 release prep 2008-07-15 18:37:21 +00:00
Jesse Keating 8d1ff85c61 Initialize branch F-9 for systemtap 2008-04-21 22:00:32 +00:00
5 changed files with 202 additions and 144 deletions

View File

@ -1 +0,0 @@
systemtap-0.6.2.tar.gz

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
systemtap-0.9.8.tar.gz

View File

@ -1,93 +0,0 @@
# Makefile for source rpm: systemtap
# $Id: Makefile,v 1.2 2006/07/19 22:31:35 roland Exp $
NAME := systemtap
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attempt a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
tarball = systemtap-$(VERSION).tar.gz
ifeq ($(clobber),t)
commit-check = :
else
commit-check = cvs -Q diff --brief > /dev/null 2>&1
endif
elfutils-version := $(shell awk '$$2 == "elfutils_version" { print $$3 }' \
systemtap.spec)
eu-dir = ../../elfutils/devel
$(eu-dir)/elfutils.spec: FORCE
cd $(@D) && cvs -Q update && $(commit-check)
$(eu-dir)/%.tar.gz: $(eu-dir)/elfutils.spec
$(MAKE) -C $(@D) sources
$(eu-dir)/%.patch: $(eu-dir)/elfutils.spec ;
import-systemtap: $(tarball)
$(commit-check) systemtap.spec
tar -zf $(tarball) -xO '*.spec' > systemtap.spec
$(MAKE) upload-systemtap
touch $@
upload-systemtap: $(tarball) \
$(addprefix $(eu-dir)/,\
elfutils-$(elfutils-version).tar.gz \
elfutils-portability.patch)
ln -f $(filter $(eu-dir)/%.tar.gz,$^) .
ln -f $(filter $(eu-dir)/%.patch,$^) .
$(MAKE) new-source FILES='$(filter-out %.patch,$^)'
copy-sources-%: import-systemtap
cd ../$* && $(commit-check)
cp -f sources elfutils-portability.patch ../$*
ln -f elfutils-*.tar.gz $(tarball) ../$*
propagate-%: copy-sources-%
cp -f systemtap.spec ../$*
touch $@
# No automagic macros in beehive, only brew.
propagate-RHEL-4: copy-sources-RHEL-4 ../RHEL-4/systemtap.spec
touch $@
propagate-FC-4: copy-sources-FC-4 ../FC-4/systemtap.spec
touch $@
../RHEL-4/systemtap.spec: systemtap.spec import-systemtap
@rm -f $@.new
(echo '%define dist .el4'; \
echo '%define rhel 4'; \
cat systemtap.spec) > $@.new
mv -f $@.new $@
../FC-4/systemtap.spec: systemtap.spec import-systemtap
@rm -f $@.new
(echo '%define dist .fc4'; \
echo '%define fedora 4'; \
cat systemtap.spec) > $@.new
mv -f $@.new $@
.PRECIOUS: propagate-% tag-%
commit-%: propagate-%
cd ../$* && cvs commit -m'Automatic update to $(VERSION)'
touch $@
tag-%: commit-%
cd ../$* && $(MAKE) tag
touch $@
build-%: tag-%
cd ../$* && $(MAKE) build

View File

@ -1 +1 @@
97a313be6dece97e0514d0c9a863413c systemtap-0.6.2.tar.gz
42128f0d5a92cc23b1565b829fed3b6f systemtap-0.9.8.tar.gz

View File

@ -1,26 +1,18 @@
# Release number for rpm build. Stays at 1 for new PACKAGE_VERSION increases.
%define release 1
# Version number of oldest elfutils release that works with systemtap.
%define elfutils_version 0.131
# Default options (suitable for fedora)
%define with_sqlite 1
%define with_docs 1
%define with_crash 0
%define with_bundled_elfutils 0
# Enable these options by default for RHEL
%if 0%{?rhel} >= 5
%define with_crash 1
%define with_bundled_elfutils 1
%endif
%{!?with_sqlite: %define with_sqlite 1}
%{!?with_docs: %define with_docs 1}
%{!?with_crash: %define with_crash 0}
%{!?with_rpm: %define with_rpm 1}
%{!?with_bundled_elfutils: %define with_bundled_elfutils 0}
%{!?elfutils_version: %define elfutils_version 0.127}
%{!?pie_supported: %define pie_supported 1}
%{!?with_grapher: %define with_grapher 0}
Name: systemtap
Version: 0.6.2
Release: %{release}%{?dist}
Version: 0.9.8
Release: 1%{?dist}
# for version, see also configure.ac
Summary: Instrumentation System
Group: Development/System
ExcludeArch: ppc
License: GPLv2+
URL: http://sourceware.org/systemtap/
Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz
@ -28,23 +20,27 @@ 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?
%if %{with_rpm}
BuildRequires: rpm-devel glibc-headers
%endif
# Alternate kernel packages kernel-PAE-devel et al have a virtual
# provide for kernel-devel, so this requirement does the right thing.
Requires: kernel-devel
Requires: gcc make
# Suggest: kernel-debuginfo
Requires: systemtap-runtime = %{version}-%{release}
BuildRequires: nss-devel nss-tools pkgconfig
%if %{with_bundled_elfutils}
Source1: elfutils-%{elfutils_version}.tar.gz
Patch1: elfutils-portability.patch
BuildRequires: m4
%define setup_elfutils -a1
%else
BuildRequires: elfutils-devel >= %{elfutils_version}
@ -55,6 +51,10 @@ Requires: crash
%if %{with_docs}
BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
# On F10, xmlto's pdf support was broken off into a sub-package,
# called 'xmlto-tex'. To avoid a specific F10 BuildReq, we'll do a
# file-based buildreq on '/usr/share/xmlto/format/fo/pdf'.
BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
%endif
%description
@ -86,6 +86,51 @@ Requires: systemtap dejagnu
The testsuite allows testing of the entire SystemTap toolchain
without having to rebuild from sources.
%package client
Summary: Instrumentation System Client
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
Requires: avahi avahi-tools nss nss-tools mktemp
%description client
SystemTap client is the client 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 server
Summary: Instrumentation System Server
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap
Requires: avahi avahi-tools nss nss-tools mktemp
%description server
SystemTap server is the server 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 sdt-devel
Summary: Static probe support tools
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
%description sdt-devel
Support tools to allow applications to use static probes.
%package initscript
Summary: Systemtap Initscript
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime, initscripts
%description initscript
Initscript for Systemtap scripts.
%prep
%setup -q %{?setup_elfutils}
@ -130,27 +175,49 @@ cd ..
%define crash_config --disable-crash
%endif
# Enable/disable the code to find and suggest needed rpms
%if %{with_rpm}
%define rpm_config --with-rpm
%else
%define rpm_config --without-rpm
%endif
%if %{with_docs}
%define docs_config --enable-docs
%else
%define docs_config --disable-docs
%endif
# Enable pie as configure defaults to disabling it
%if %{pie_supported}
%define pie_config --enable-pie
%else
%define pie_config --disable-pie
%endif
%if %{with_grapher}
%define grapher_config --enable-grapher
%else
%define grapher_config --disable-grapher
%endif
%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config}
%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{grapher_config} %{rpm_config}
make %{?_smp_mflags}
# 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
%install
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=$RPM_BUILD_ROOT install
# We want the examples in the special doc dir, not the build install dir.
# We build it in place and then move it away so it doesn't get installed
# twice. rpm can specify itself where the (versioned) docs go with the
# %doc directive.
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@'
# 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
@ -159,8 +226,25 @@ chmod 755 $RPM_BUILD_ROOT%{_bindir}/staprun
# Copy over the testsuite
cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap
mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/src
cp -rp examples $RPM_BUILD_ROOT%{_datadir}/%{name}/src
%if %{with_docs}
# We want the manuals in the special doc dir, not the generic doc install dir.
# We build it in place and then move it away so it doesn't get installed
# twice. rpm can specify itself where the (versioned) docs go with the
# %doc directive.
mkdir docs.installed
mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/
mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/tapsets docs.installed/
%endif
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
install -m 755 initscript/systemtap $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemtap
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/conf.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/script.d
install -m 644 initscript/config $RPM_BUILD_ROOT%{_sysconfdir}/systemtap
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/systemtap
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/systemtap
%clean
rm -rf ${RPM_BUILD_ROOT}
@ -170,18 +254,39 @@ getent group stapdev >/dev/null || groupadd -r stapdev
getent group stapusr >/dev/null || groupadd -r stapusr
exit 0
%post initscript
chkconfig --add systemtap
exit 0
%preun initscript
chkconfig --del systemtap
exit 0
%post
# Remove any previously-built uprobes.ko materials
(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
%preun
# Ditto
(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
%files
%defattr(-,root,root)
%doc README AUTHORS NEWS COPYING examples
%if %{with_docs}
%doc doc/tutorial.pdf
%doc doc/langref.pdf
%doc docs.installed/*.pdf
%doc docs.installed/tapsets
%endif
%{_bindir}/stap
%{_bindir}/stap-report
%{_bindir}/stap-env
%{_bindir}/stap-gen-cert
%{_bindir}/stap-authorize-cert
%{_bindir}/stap-authorize-signing-cert
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man3/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/runtime
@ -200,35 +305,81 @@ exit 0
%files runtime
%defattr(-,root,root)
%attr(4111,root,root) %{_bindir}/staprun
%{_bindir}/stap-report
%{_libexecdir}/%{name}
%{_mandir}/man8/*
%{_mandir}/man8/staprun.8*
%doc README AUTHORS NEWS COPYING
%files testsuite
%defattr(-,root,root)
%{_datadir}/%{name}/src
%{_datadir}/%{name}/testsuite
%files client
%defattr(-,root,root)
%{_bindir}/stap-client
%{_bindir}/stap-env
%{_bindir}/stap-find-servers
%{_bindir}/stap-client-connect
%{_mandir}/man8/stap-server.8*
%files server
%defattr(-,root,root)
%{_bindir}/stap-server
%{_bindir}/stap-serverd
%{_bindir}/stap-env
%{_bindir}/stap-start-server
%{_bindir}/stap-find-servers
%{_bindir}/stap-find-or-start-server
%{_bindir}/stap-stop-server
%{_bindir}/stap-gen-cert
%{_bindir}/stap-authorize-cert
%{_bindir}/stap-authorize-server-cert
%{_bindir}/stap-server-connect
%{_mandir}/man8/stap-server.8*
%files sdt-devel
%defattr(-,root,root)
%{_bindir}/dtrace
%{_includedir}/sys/sdt.h
%files initscript
%defattr(-,root,root)
%{_sysconfdir}/init.d/systemtap
%dir %{_sysconfdir}/systemtap
%dir %{_sysconfdir}/systemtap/conf.d
%dir %{_sysconfdir}/systemtap/script.d
%config(noreplace) %{_sysconfdir}/systemtap/config
%dir %{_localstatedir}/cache/systemtap
%dir %{_localstatedir}/run/systemtap
%doc initscript/README.initscript
%changelog
* Thu Mar 27 2008 Will Cohen <wcohen@redhat.com> - 0.6.2-1
- Rebase.
* Thu Jun 11 2009 Josh Stone <jistone@redhat.com> - 0.9.8-1
- Upstream release.
* Wed Feb 21 2008 Will Cohen <wcohen@redhat.com> - 0.6.1-8
- Bump version.
* Thu Apr 23 2009 Josh Stone <jistone@redhat.com> - 0.9.7-1
- Upstream release.
* Wed Feb 13 2008 Will Cohen <wcohen@redhat.com> - 0.6.1-5
- Correct elfi typo in runtime/stack-i386.c.
* Fri Mar 27 2009 Josh Stone <jistone@redhat.com> - 0.9.5-1
- Upstream release.
* Tue Feb 12 2008 Will Cohen <wcohen@redhat.com> - 0.6.1-4
- Add patch for gcc 4.3.
* Wed Mar 18 2009 Will Cohen <wcohen@redhat.com> - 0.9-2
- Add location of man pages.
* Tue Feb 17 2009 Frank Ch. Eigler <fche@redhat.com> - 0.9-1
- Upstream release.
* Thu Nov 13 2008 Frank Ch. Eigler <fche@redhat.com> - 0.8-1
- Upstream release.
* Tue Jul 15 2008 Frank Ch. Eigler <fche@redhat.com> - 0.7-1
- Upstream release.
* Fri Feb 1 2008 Frank Ch. Eigler <fche@redhat.com> - 0.6.1-3
- Add zlib-devel dependency which is supposed to come from crash-devel.
* Fri Feb 1 2008 Frank Ch. Eigler <fche@redhat.com> - 0.6.1-2
- Process testsuite .stp files to fool "#! stap" dep. finder.
- 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 <fche@redhat.com> - 0.6.1-1
- Add crash-devel buildreq to build staplog.so crash(8) module.