From ce950257b8feb87e57726044dceec40b21bc2ce7 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Tue, 19 May 2009 16:17:07 -0400 Subject: Disable building grapher code in rpm. --- systemtap.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'systemtap.spec') diff --git a/systemtap.spec b/systemtap.spec index 5b9283cf..332fedf8 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -4,6 +4,7 @@ %{!?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.9.7 @@ -183,8 +184,14 @@ cd .. %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} %{pie_config} +%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{grapher_config} make %{?_smp_mflags} %install -- cgit From d79591b3274ba961600d387f41277626608b02af Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 21 May 2009 00:38:46 -0400 Subject: some versions of bundled elfutils needs m4 for building --- systemtap.spec | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap.spec') diff --git a/systemtap.spec b/systemtap.spec index 332fedf8..d3b3f237 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -36,6 +36,7 @@ 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} -- cgit From 1208cc21f63fff917e7817487d727d4cbe12d0ea Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 21 May 2009 10:28:55 -0400 Subject: PR10182: clean uprobes.ko during rpm upgrade --- systemtap.spec | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'systemtap.spec') diff --git a/systemtap.spec b/systemtap.spec index d3b3f237..c0864657 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -252,6 +252,13 @@ exit 0 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) -- cgit From 2ed04863c3426f94932d4a4e4b5d6c7b84e49dfd Mon Sep 17 00:00:00 2001 From: William Cohen Date: Wed, 27 May 2009 11:14:12 -0400 Subject: Suggest rpms to install using debuginfo-install. The patch makes use of the RPM libraries to determine which rpm supplied the executable and from that information suggest a command to install the appropriate debuginfo rpm. This is enabled using the "--with-rpm" option for configure. Can be explicitly disabled with "--without-rpm". --- systemtap.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'systemtap.spec') diff --git a/systemtap.spec b/systemtap.spec index c0864657..6e4e6abc 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,6 +1,7 @@ %{!?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} @@ -25,6 +26,9 @@ BuildRequires: sqlite-devel %if %{with_crash} BuildRequires: crash-devel zlib-devel %endif +%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 @@ -172,6 +176,13 @@ 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 @@ -192,7 +203,7 @@ cd .. %endif -%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{grapher_config} +%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{grapher_config} %{rpm_config} make %{?_smp_mflags} %install -- cgit From 749269040630f0f250f431a258e7967f54dc9a5c Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 11 Jun 2009 13:05:24 -0400 Subject: remove erroneous dependency (systemtap-sdt-devel -> systemtap) --- systemtap.spec | 1 - 1 file changed, 1 deletion(-) (limited to 'systemtap.spec') diff --git a/systemtap.spec b/systemtap.spec index 6e4e6abc..521eec75 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -117,7 +117,6 @@ Summary: Static probe support tools Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Requires: systemtap %description sdt-devel Support tools to allow applications to use static probes. -- cgit