SHA256
1
0
forked from pool/systemtap
OBS User unknown 2008-08-14 00:38:19 +00:00 committed by Git OBS Bridge
parent a9c66641d5
commit 7db7d1e059
7 changed files with 80 additions and 38 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b4c34787ec1356ff3741f79fb7d70bf24ba9504739604eb8227c7a68489461e
size 863151

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:308ceaacd14b8db9a3244251e11e7dd747cd99cadfd5766ebc50ceea1fbe0041
size 939027

39
systemtap-docdir-fix.diff Normal file
View File

@ -0,0 +1,39 @@
--- Makefile.am-dist 2008-08-12 18:44:01.000000000 +0200
+++ Makefile.am 2008-08-12 18:44:26.000000000 +0200
@@ -186,7 +186,7 @@
| while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done)
(cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \
| egrep -v 'check.exp|ChangeLog|examples-index-gen.pl' \
- | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/examples/$$f; done)
+ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/systemtap/examples/$$f; done)
TEST_COV_DIR = coverage
--- stapex.5.in-dist 2008-08-12 18:28:35.000000000 +0200
+++ stapex.5.in 2008-08-12 18:30:12.000000000 +0200
@@ -109,12 +109,12 @@
.SH MORE EXAMPLES
Larger examples, demos and samples can be found in
-@prefix@/doc/systemtap*/examples, each example comes with either a .txt
+@_docdir@/systemtap*/examples, each example comes with either a .txt
or .meta file explaining what the example, sample or demo does and how
it is ordinarily run.
.SH SEE ALSO
-.BR @prefix@/doc/systemtap*/examples
+.BR @_docdir@/systemtap/examples
.IR stap (1)
.IR stapprobes (5)
.IR stapfuncs (5)
--- doc/Makefile.am-dist 2008-08-12 18:31:04.000000000 +0200
+++ doc/Makefile.am 2008-08-12 18:31:17.000000000 +0200
@@ -2,7 +2,7 @@
## process this file with automake to produce Makefile.in
PDF_FILES = tutorial.pdf langref.pdf
-DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
+DOC_INSTALL_DIR = $(DESTDIR)$(docdir)/systemtap
if BUILD_DOCS
all-local: $(PDF_FILES)

View File

@ -1,14 +0,0 @@
--- buildrun.cxx-dist 2008-06-20 15:20:32.000000000 +0200
+++ buildrun.cxx 2008-06-20 15:22:12.000000000 +0200
@@ -78,8 +78,10 @@ compile_pass (systemtap_session& s)
if (s.verbose > 3)
superverbose = "set -x;";
+ // fix -I in KBUILD_CFLAGS
+ o << "_KBUILD_CFLAGS = $(call flags,KBUILD_CFLAGS)" << endl;
o << "stap_check_gcc = $(shell " << superverbose << " if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo \"$(1)\"; else echo \"$(2)\"; fi)" << endl;
- o << "stap_check_build = $(shell " << superverbose << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null 2>&1 ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
+ o << "stap_check_build = $(shell " << superverbose << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(_KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null 2>&1 ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
o << "SYSTEMTAP_RUNTIME = \"" << s.runtime_path << "\"" << endl;

View File

@ -1,11 +0,0 @@
--- translate.cxx-dist 2008-06-20 15:41:33.000000000 +0200
+++ translate.cxx 2008-06-20 15:41:49.000000000 +0200
@@ -4530,7 +4530,7 @@ translate_pass (systemtap_session& s)
s.op->newline() << "#include <linux/utsrelease.h>";
s.op->newline() << "#include <linux/utsname.h>";
s.op->newline() << "#include <linux/version.h>";
- s.op->newline() << "#include <linux/compile.h>";
+ // s.op->newline() << "#include <linux/compile.h>";
s.op->newline() << "#include \"loc2c-runtime.h\" ";
// XXX: old 2.6 kernel hack

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Aug 12 18:11:10 CEST 2008 - tiwai@suse.de
- updated to snapshot 20080809
* bump to 0.7.1
* tutorials
* examples
* i386-fix merged
* previous patches are all merged in
- add latex2html to buildrequires for generating documents
-------------------------------------------------------------------
Fri Jun 20 15:58:30 CEST 2008 - tiwai@suse.de

View File

@ -1,10 +1,17 @@
#
# spec file for package systemtap (Version 0.7)
# spec file for package systemtap (Version 0.7.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -13,9 +20,11 @@
Name: systemtap
BuildRequires: gcc-c++ glib2-devel libcap-devel libebl-devel pkg-config sqlite-devel
%define package_version 20080614
# for documents
BuildRequires: latex2html
%define package_version 20080809
License: GPL v2 or later
Version: 0.7
Version: 0.7.1
Release: 1
Summary: Instrumentation System
Group: Development/Tools/Debuggers
@ -23,8 +32,7 @@ Url: http://sourceware.org/systemtap/
# Requires: kernel-source gcc make
# Suggest: kernel-smp-debuginfo
Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2
Patch: systemtap-i386-fix.diff
Patch1: systemtap-no-linux-compile-h.diff
Patch: systemtap-docdir-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -45,22 +53,23 @@ Authors:
# %setup -n %{name}-%{package_version} -q -a1
%setup -n src -q
%patch
%patch1
%build
%configure
autoreconf -fi
%configure --docdir=%{_docdir}
make %{?jobs:-j %jobs}
%install
%makeinstall
mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap
cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_docdir}/systemtap/
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root)
%doc README AUTHORS NEWS COPYING
%doc %{_docdir}/systemtap
%{_bindir}/*
%{_mandir}/man?/*
%{_libdir}/systemtap
@ -68,6 +77,14 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %attr(0755,root,root) /var/cache/systemtap
%changelog
* Tue Aug 12 2008 tiwai@suse.de
- updated to snapshot 20080809
* bump to 0.7.1
* tutorials
* examples
* i386-fix merged
* previous patches are all merged in
- add latex2html to buildrequires for generating documents
* Fri Jun 20 2008 tiwai@suse.de
- fix run on i386 (bnc#401970)
- don't include obsolete linux/compile.h.