Compare commits

...

65 Commits

Author SHA1 Message Date
Björn Esser afaf045a8d Rebuild (json-c) 2020-04-22 00:13:50 +02:00
Frank Ch. Eigler 7b7d0a4564 Automated weekly systemtap rawhide release: 0.20200211git91ffb97ad335 2020-02-11 11:16:53 -05:00
Frank Ch. Eigler f9cde08988 Automated weekly systemtap rawhide release: 0.20200203git6c0b74f5910a 2020-02-03 15:19:55 -05:00
Fedora Release Engineering 0337e2205b - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 00:59:44 +00:00
Frank Ch. Eigler d2b504472b Automated weekly systemtap rawhide release: 0.20200112gitb1e6a6645bba 2020-01-12 11:23:30 -05:00
Frank Ch. Eigler 2b9b42f2d9 drop unused bundled-elfutils src 2019-11-26 18:05:17 -05:00
Frank Ch. Eigler cce194f7aa nothing 2019-11-26 15:50:56 -05:00
Frank Ch. Eigler 4580a15cda release 4.2 2019-11-18 17:53:04 -05:00
Miro Hrončok c7fcc864dd Rebuilt for Python 3.8.0rc1 (#1748018) 2019-10-03 14:39:20 +02:00
Aaron Merey 91091ed9d4 Automated weekly systemtap rawhide release: 0.20190827git8ffab23ff 2019-08-27 16:50:09 -04:00
Aaron Merey 0b77a93612 Automated weekly systemtap rawhide release: 0.20190827git8ffab23ff 2019-08-27 16:39:43 -04:00
Miro Hrončok 16ba7e1ae4 Rebuilt for Python 3.8 2019-08-19 11:06:49 +02:00
Frank Ch. Eigler 3a4041d93e Automated weekly systemtap rawhide release: 0.20190807gitebfc300ec2ad 2019-08-07 09:39:21 -04:00
Fedora Release Engineering 0ee54e3e30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 00:55:00 +00:00
Frank Ch. Eigler 49549bc90e Automated weekly systemtap rawhide release: 0.20190618git47c3f6c60174 2019-06-18 16:43:48 -04:00
Frank Ch. Eigler f2ca371421 Automated weekly systemtap rawhide release: 0.20190613git2d77f531a5d1 2019-06-13 14:33:35 -04:00
Igor Gnatenko b2c2629c5d
Rebuild for RPM 4.15
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-11 00:13:24 +02:00
Igor Gnatenko 990fc26c0a
Rebuild for RPM 4.15
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 17:42:06 +02:00
Stan Cox bb12cb8ceb Rebuild for dyninst 10.1.0 2019-06-04 14:35:44 -04:00
Frank Ch. Eigler 91921b7935 Automated weekly systemtap rawhide release: 0.20190513git8b868f3dd030 2019-05-13 21:42:17 -04:00
Serhei Makarov a6724f27dd systemtap.spec : inconsequential(?) typo 2019-05-07 14:58:30 -04:00
Serhei Makarov af410607bf rhbz1650371.patch is now in upstream; remove 2019-05-07 14:56:56 -04:00
Serhei Makarov 1a31851092 upstream 4.1 release 2019-05-07 14:23:13 -04:00
Frank Ch. Eigler 34ba7d8158 Automated weekly systemtap rawhide release: 0.20190502git446e7c358247 2019-05-02 11:17:23 -04:00
Frank Ch. Eigler 840641a3c3 Automated weekly systemtap rawhide release: 0.20190327git2ede4cecb20c 2019-03-27 12:35:25 -04:00
Frank Ch. Eigler aa6fc8f4c3 Automated weekly systemtap rawhide release: 0.20190308gitb3627d9aa037 2019-03-08 11:40:12 -05:00
Frank Ch. Eigler 76a4cb15d7 Automated weekly systemtap rawhide release: 0.20190307gitf7fb9c9182dc 2019-03-07 15:58:52 -05:00
Igor Gnatenko e85c4ec28f Rebuild for readline 8.0 2019-02-17 09:30:53 +01:00
Frank Ch. Eigler 38eab87aa2 Automated weekly systemtap rawhide release: 0.20190207git4e76869512d2 2019-02-07 10:14:17 -05:00
Fedora Release Engineering 360a94dd83 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 09:19:31 +00:00
Frank Ch. Eigler 00a7eb9b22 Automated weekly systemtap rawhide release: 0.20190125git905865da1024 2019-01-25 13:05:51 -05:00
Frank Ch. Eigler 64b52e0137 Automated weekly systemtap rawhide release: 0.20190123gitc8084763b75f 2019-01-23 14:42:58 -05:00
Frank Ch. Eigler e398a475bc Automated weekly systemtap rawhide release: 0.20181204git891810c246d6 2018-12-04 14:30:02 -05:00
Frank Ch. Eigler c27bf142be Automated weekly systemtap rawhide release: 0.20181203gitec3b46eb9b19 2018-12-03 15:46:04 -05:00
Frank Ch. Eigler 3f6623da51 Automated weekly systemtap rawhide release: 0.20181126git47ce37a149b6 2018-11-26 22:38:23 -05:00
Frank Ch. Eigler 8fa0dba5a2 Automated weekly systemtap rawhide release: 0.20181126gitf082df49dd91 2018-11-26 18:51:48 -05:00
Frank Ch. Eigler 5a071c9e48 Merge branch 'f29'
* f29:
  rhbz1650371
  upstream release 3.3
  3.2-11 spec update.
  3.2-11
  3.2-10
  3.2-9 - Add unwind-fallback.patch.
  Backport fix for removed timers in kernel 4.15 (#1546563)
2018-11-15 20:42:08 -05:00
Frank Ch. Eigler c0ec2425f3 rhbz1650371 2018-11-15 20:38:09 -05:00
Peter Robinson e6b0de4db8 Crash and virt host supported on ppc64le and aarch64, Move chkconfig to traditional initscripts deps (not required for systemd), spec cleanups 2018-10-14 22:14:52 +01:00
Frank Ch. Eigler a612da876f Merge branch 'master' into f27
* master: (39 commits)
  upstream 4.0 release
  test simplify more
  Automated weekly systemtap rawhide release: 0.20181003git4ad1e11de831
  CI try 8
  CI try 7
  CI try 6
  Automated weekly systemtap rawhide release: 0.20180914gitfe4e14f4af16.1
  CI take 5, k.i.s.s.
  Automated weekly systemtap rawhide release: 0.20180914gitfe4e14f4af16
  CI try 4
  Automated weekly systemtap rawhide release: 0.20180914git11a0a7aea387
  Automated weekly systemtap rawhide release: 0.20180914gitc1befcceae01
  CI try 3 - hand-install the kernel-debuginfo
  Automated weekly systemtap rawhide release: 0.20180914gitc1befcceae01
  more rhts boilerplate imported from acl/
  Automated weekly systemtap rawhide release: 0.20180914gitc51d4e55d285
  CI experiment
  Automated weekly systemtap rawhide release: 0.20180906git37598c4fee7c
  Automated weekly systemtap rawhide release: 0.20180906git37598c4fee7c
  Automated weekly systemtap rawhide release: 0.20180810git
  ...
2018-10-13 16:21:18 -04:00
Frank Ch. Eigler 227f3127ce upstream 4.0 release 2018-10-13 15:32:07 -04:00
Frank Ch. Eigler 864ecbdfc2 test simplify more 2018-10-03 22:30:10 -04:00
Frank Ch. Eigler e5251ded41 Automated weekly systemtap rawhide release: 0.20181003git4ad1e11de831 2018-10-03 22:29:39 -04:00
Frank Ch. Eigler b6ed2853aa CI try 8 2018-09-16 11:11:19 -04:00
Frank Ch. Eigler c985571b05 CI try 7 2018-09-16 07:32:39 -04:00
Frank Ch. Eigler 2bcf1a3045 CI try 6 2018-09-16 06:27:14 -04:00
Frank Ch. Eigler 4fb6cc1adf Automated weekly systemtap rawhide release: 0.20180914gitfe4e14f4af16.1 2018-09-14 21:18:48 -04:00
Frank Ch. Eigler 19d1385d28 CI take 5, k.i.s.s. 2018-09-14 21:15:59 -04:00
Frank Ch. Eigler 645ca44195 Automated weekly systemtap rawhide release: 0.20180914gitfe4e14f4af16 2018-09-14 19:46:13 -04:00
Frank Ch. Eigler c730acbcfd CI try 4 2018-09-14 19:38:35 -04:00
Frank Ch. Eigler 33ac182b01 Automated weekly systemtap rawhide release: 0.20180914git11a0a7aea387 2018-09-14 18:00:46 -04:00
Frank Ch. Eigler 31f6729a4f Automated weekly systemtap rawhide release: 0.20180914gitc1befcceae01 2018-09-14 17:15:01 -04:00
Frank Ch. Eigler 534796bb5d CI try 3 - hand-install the kernel-debuginfo 2018-09-14 16:58:49 -04:00
Frank Ch. Eigler 85ce83bb04 Automated weekly systemtap rawhide release: 0.20180914gitc1befcceae01 2018-09-14 16:03:52 -04:00
Frank Ch. Eigler 40630c72c2 more rhts boilerplate imported from acl/ 2018-09-14 16:01:55 -04:00
Frank Ch. Eigler 48bf308579 Automated weekly systemtap rawhide release: 0.20180914gitc51d4e55d285 2018-09-14 14:37:28 -04:00
Frank Ch. Eigler d09f6eaf35 CI experiment 2018-09-14 14:21:05 -04:00
Frank Ch. Eigler ddcf2c9e17 Automated weekly systemtap rawhide release: 0.20180906git37598c4fee7c 2018-09-06 22:00:28 -04:00
Frank Ch. Eigler 8564a9f880 Automated weekly systemtap rawhide release: 0.20180906git37598c4fee7c 2018-09-06 21:58:00 -04:00
Frank Ch. Eigler 3df356ef9a upstream release 3.3 2018-06-08 18:46:04 -04:00
Mark Wielaard b67c63adc5 3.2-11 spec update. 2018-04-20 17:09:03 +02:00
Mark Wielaard 0d3a3a4eee 3.2-11
- Add rhbz1549063.patch (/bin/env -> /usr/bin/env)
- Add rhbz1566745.patch (4.15 kernel tapset updates)
- Enable accidentially disabled Suggests: kernel-devel again.
2018-04-20 17:08:55 +02:00
Mark Wielaard c6a588ad5d 3.2-10
- Add unwind-fallback.patch
- rhbz1566422.patch
2018-04-20 17:08:20 +02:00
Mark Wielaard a1381b8649 3.2-9 - Add unwind-fallback.patch. 2018-04-20 17:07:55 +02:00
Sergey Avseyev b60bd66c70 Backport fix for removed timers in kernel 4.15 (#1546563) 2018-02-22 12:31:57 +03:00
7 changed files with 178 additions and 101 deletions

29
.gitignore vendored
View File

@ -10,3 +10,32 @@
/systemtap-3.3-0.20180508git9c6ac6cda49e.tar.gz
/systemtap-3.3.tar.gz
/systemtap-4.0-0.20180810git.tar.gz
/systemtap-4.0-0.20180906git37598c4fee7c.tar.gz
/systemtap-4.0-0.20180914gitc51d4e55d285.tar.gz
/systemtap-4.0-0.20180914gitc1befcceae01.tar.gz
/systemtap-4.0-0.20180914git11a0a7aea387.tar.gz
/systemtap-4.0-0.20180914gitfe4e14f4af16.tar.gz
/systemtap-4.0-0.20180914gitfe4e14f4af16.1.tar.gz
/systemtap-4.0-0.20181003git4ad1e11de831.tar.gz
/systemtap-4.0.tar.gz
/systemtap-4.1-0.20181126gitf082df49dd91.tar.gz
/systemtap-4.1-0.20181126git47ce37a149b6.tar.gz
/systemtap-4.1-0.20181203gitec3b46eb9b19.tar.gz
/systemtap-4.1-0.20181204git891810c246d6.tar.gz
/systemtap-4.1-0.20190123gitc8084763b75f.tar.gz
/systemtap-4.1-0.20190125git905865da1024.tar.gz
/systemtap-4.1-0.20190207git4e76869512d2.tar.gz
/systemtap-4.1-0.20190307gitf7fb9c9182dc.tar.gz
/systemtap-4.1-0.20190308gitb3627d9aa037.tar.gz
/systemtap-4.1-0.20190327git2ede4cecb20c.tar.gz
/systemtap-4.1-0.20190502git446e7c358247.tar.gz
/systemtap-4.1.tar.gz
/systemtap-4.2-0.20190513git8b868f3dd030.tar.gz
/systemtap-4.2-0.20190613git2d77f531a5d1.tar.gz
/systemtap-4.2-0.20190618git47c3f6c60174.tar.gz
/systemtap-4.2-0.20190807gitebfc300ec2ad.tar.gz
/systemtap-4.2-0.20190827git8ffab23ff.tar.gz
/systemtap-4.2.tar.gz
/systemtap-4.3-0.20200112gitb1e6a6645bba.tar.gz
/systemtap-4.3-0.20200203git6c0b74f5910a.tar.gz
/systemtap-4.3-0.20200211git91ffb97ad335.tar.gz

View File

@ -1 +1 @@
SHA512 (systemtap-4.0-0.20180810git.tar.gz) = 39ec6621f9e8c768f2922f0ebd8fe074c19b09036f0744d2b64a30e44fe6be1d2f1181149d7c226d7b76c4fa95d0d31ba4ae899089dc3d578b2e78e7f28424e2
SHA512 (systemtap-4.3-0.20200211git91ffb97ad335.tar.gz) = 449959f46a89633f57c20cbeb0ded7031587e6df7cf19c30a237bb1886a7235e066c2878023385a7ec83e6045ab31bc8819991574a5840c8080d2ea066974eb5

View File

@ -4,17 +4,16 @@
%{!?with_htmldocs: %global with_htmldocs 0}
%{!?with_monitor: %global with_monitor 1}
# crash is not available
%ifarch ppc ppc64 %{sparc} aarch64 ppc64le %{mips}
%ifarch ppc ppc64 %{sparc} %{mips}
%{!?with_crash: %global with_crash 0}
%else
%{!?with_crash: %global with_crash 1}
%endif
%{!?with_rpm: %global with_rpm 1}
%{!?with_bundled_elfutils: %global with_bundled_elfutils 0}
%{!?elfutils_version: %global elfutils_version 0.142}
%{!?pie_supported: %global pie_supported 1}
%{!?with_boost: %global with_boost 0}
%ifarch %{ix86} x86_64 ppc ppc64
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64
%{!?with_dyninst: %global with_dyninst 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
%else
%{!?with_dyninst: %global with_dyninst 0}
@ -38,10 +37,14 @@
%{!?with_python2_probes: %global with_python2_probes (0%{?fedora} <= 28 && 0%{?rhel} <= 7)}
%{!?with_python3_probes: %global with_python3_probes (0%{?fedora} >= 23 || 0%{?rhel} > 7)}
%{!?with_httpd: %global with_httpd 0}
%{!?with_specific_python: %global with_specific_python 0%{?fedora} >= 31}
# Virt is supported on these arches, even on el7, but it's not in core EL7
%if 0%{?rhel} <= 7
%ifarch ppc64le aarch64
%global with_virthost 0
%endif
%endif
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6
%define initdir %{_initddir}
@ -80,11 +83,11 @@
%endif
# To avoid testsuite/*/*.stp has shebang which doesn't start with '/'
%undefine __brp_mangle_shebangs
%define __brp_mangle_shebangs_exclude_from .stp$
Name: systemtap
Version: 4.0
Release: 0.20180810git%{?dist}
Version: 4.3
Release: 0.20200212git91ffb97ad335%{?dist}
# for version, see also configure.ac
@ -116,18 +119,18 @@ Release: 0.20180810git%{?dist}
# intermediary stap-server for --use-server: systemtap-server (-devel unused)
Summary: Programmable system-wide instrumentation system
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Source: %{name}-%{version}-0.20180810git.tar.gz
Source: %{name}-%{version}-0.20200211git91ffb97ad335.tar.gz
# Build*
BuildRequires: gcc-c++
BuildRequires: cpio
BuildRequires: gettext-devel
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(avahi-client)
%if %{with_dyninst}
BuildRequires: dyninst-devel >= 8.0
BuildRequires: dyninst-devel >= 10.0
BuildRequires: pkgconfig(libselinux)
%endif
%if %{with_sqlite}
@ -150,14 +153,7 @@ BuildRequires: crash-devel zlib-devel
%if %{with_rpm}
BuildRequires: rpm-devel
%endif
%if %{with_bundled_elfutils}
Source1: elfutils-%{elfutils_version}.tar.gz
Patch1: elfutils-portability.patch
BuildRequires: m4
%global setup_elfutils -a1
%else
BuildRequires: elfutils-devel >= %{elfutils_version}
%endif
%if %{with_docs}
BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@ -200,6 +196,9 @@ BuildRequires: python-setuptools
BuildRequires: python3-devel
BuildRequires: python3-setuptools
%endif
%if %{with_specific_python}
BuildRequires: /usr/bin/pathfix.py
%endif
%if %{with_httpd}
BuildRequires: libmicrohttpd-devel
@ -220,7 +219,6 @@ the components needed to locally develop and execute systemtap scripts.
%package server
Summary: Instrumentation System Server
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-devel = %{version}-%{release}
@ -230,8 +228,6 @@ Conflicts: systemtap-client < %{version}-%{release}
Requires: nss coreutils
Requires: zip unzip
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig
BuildRequires: nss-devel avahi-devel
%if %{with_openssl}
Requires: openssl
@ -239,6 +235,8 @@ Requires: openssl
%if %{with_systemd}
Requires: systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
%endif
@ -251,14 +249,16 @@ compiles systemtap scripts to kernel objects on their demand.
%package devel
Summary: Programmable system-wide instrumentation system - development headers, tools
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
# The virtual provide 'kernel-devel-uname-r' tries to get the right
# kernel variant (kernel-PAE, kernel-debug, etc.) devel package
# installed.
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
Recommends: (kernel-debug-devel if kernel-debug)
Recommends: (kernel-devel if kernel)
%else
Requires: kernel-devel-uname-r
%{?fedora:Suggests: kernel-devel}
%endif
Requires: gcc make
Conflicts: systemtap-client < %{version}-%{release}
Conflicts: systemtap-server < %{version}-%{release}
@ -276,7 +276,6 @@ a copy of the standard tapset library and the runtime library C files.
%package runtime
Summary: Programmable system-wide instrumentation system - runtime
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires(pre): shadow-utils
@ -292,7 +291,6 @@ using a local or remote systemtap-devel installation.
%package client
Summary: Programmable system-wide instrumentation system - client
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: zip unzip
@ -316,15 +314,14 @@ documentation, and a copy of the tapset library for reference.
%package initscript
Summary: Systemtap Initscripts
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap = %{version}-%{release}
Requires(post): chkconfig
Requires(preun): chkconfig
%if %{with_systemd}
Requires: systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
%endif
@ -337,7 +334,6 @@ boot-time probing if supported.
%package sdt-devel
Summary: Static probe support tools
Group: Development/System
License: GPLv2+ and Public Domain
URL: http://sourceware.org/systemtap/
%if %{with_pyparsing}
@ -361,7 +357,6 @@ with the optional dtrace-compatibility preprocessor to process related
%package testsuite
Summary: Instrumentation System Testsuite
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap = %{version}-%{release}
@ -419,12 +414,12 @@ systemtap on the current system.
%if %{with_java}
%package runtime-java
Summary: Systemtap Java Runtime Support
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
Requires: byteman > 2.0
Requires: iproute
Requires: java-devel
%description runtime-java
This package includes support files needed to run systemtap scripts
@ -434,7 +429,6 @@ that probe Java processes running on the OpenJDK runtimes using Byteman.
%if %{with_python2_probes}
%package runtime-python2
Summary: Systemtap Python 2 Runtime Support
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
@ -447,7 +441,6 @@ that probe python 2 processes.
%if %{with_python3_probes}
%package runtime-python3
Summary: Systemtap Python 3 Runtime Support
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
@ -463,14 +456,13 @@ that probe python 3 processes.
%endif
%if %{with_python3}
%package stap-exporter
%package exporter
Summary: Systemtap-prometheus interoperation mechanism
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
%description stap-exporter
%description exporter
This package includes files for a systemd service that manages
systemtap sessions and relays prometheus metrics from the sessions
to remote requesters on demand.
@ -479,7 +471,6 @@ to remote requesters on demand.
%if %{with_virthost}
%package runtime-virthost
Summary: Systemtap Cross-VM Instrumentation - host
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: libvirt >= 1.0.2
@ -494,7 +485,6 @@ connection.
%if %{with_virtguest}
%package runtime-virtguest
Summary: Systemtap Cross-VM Instrumentation - guest
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
@ -516,35 +506,10 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
# ------------------------------------------------------------------------
%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
%setup -q
%build
%if %{with_bundled_elfutils}
# Build our own copy of elfutils.
%global 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.
%global _use_internal_dependency_generator 0
%global filter_eulibs() /bin/sh -c "%{1} | sed '/libelf/d;/libdw/d;/libebl/d'"
%global __find_provides %{filter_eulibs /usr/lib/rpm/find-provides}
%global __find_requires %{filter_eulibs /usr/lib/rpm/find-requires}
# This will be needed for running stap when not installed, for the test suite.
%global elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils
%endif
# Enable/disable the dyninst pure-userspace backend
%if %{with_dyninst}
%global dyninst_config --with-dyninst
@ -640,15 +605,11 @@ cd ..
# We don't ship compileworthy python code, just oddball samples
%global py_auto_byte_compile 0
%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
%configure %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
make %{?_smp_mflags}
%if %{with_emacsvim}
%{_emacs_bytecompile} emacs/systemtap-mode.el
%endif
%install
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=$RPM_BUILD_ROOT install
%find_lang %{name}
for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do
@ -774,21 +735,19 @@ done
touch $RPM_BUILD_ROOT%{dracutstap}/params.conf
%endif
%if %{with_python3}
mkdir -p $RPM_BUILD_ROOT/stap-exporter
install -p -m 755 stap-exporter/stap-exporter $RPM_BUILD_ROOT%{_bindir}
install -m 644 stap-exporter/stap-exporter.service $RPM_BUILD_ROOT%{_unitdir}
install -m 644 stap-exporter/stap-exporter.8* $RPM_BUILD_ROOT%{_mandir}/man8
%if %{with_specific_python}
# Some files got ambiguous python shebangs, we fix them after everything else is done
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitearch} %{buildroot}%{_bindir}/*
%endif
%pre runtime
getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr
getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys
getent group stapdev >/dev/null || groupadd -g 158 -r stapdev 2>/dev/null || groupadd -r stapdev
getent group stapusr >/dev/null || groupadd -f -g 156 -r stapusr
getent group stapsys >/dev/null || groupadd -f -g 157 -r stapsys
getent group stapdev >/dev/null || groupadd -f -g 158 -r stapdev
exit 0
%pre server
getent group stap-server >/dev/null || groupadd -g 155 -r stap-server 2>/dev/null || groupadd -r stap-server
getent group stap-server >/dev/null || groupadd -f -g 155 -r stap-server
getent passwd stap-server >/dev/null || \
useradd -c "Systemtap Compile Server" -u 155 -g stap-server -d %{_localstatedir}/lib/stap-server -r -s /sbin/nologin stap-server 2>/dev/null || \
useradd -c "Systemtap Compile Server" -g stap-server -d %{_localstatedir}/lib/stap-server -r -s /sbin/nologin stap-server
@ -957,11 +916,22 @@ fi
exit 0
%if %{with_python3}
%preun stap-exporter
/bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || :
/bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || :
%endif
%if %{with_systemd}
%preun exporter
if [ $1 = 0 ] ; then
/bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || :
/bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || :
fi
exit 0
%postun exporter
# Restart service if this is an upgrade rather than an uninstall
if [ "$1" -ge "1" ]; then
/bin/systemctl condrestart stap-exporter >/dev/null 2>&1 || :
fi
exit 0
%endif
%endif
%post
# Remove any previously-built uprobes.ko materials
@ -1031,7 +1001,6 @@ done
# The master "systemtap" rpm doesn't include any files.
%files server -f systemtap.lang
%defattr(-,root,root)
%{_bindir}/stap-server
%dir %{_libexecdir}/systemtap
%{_libexecdir}/systemtap/stap-serverd
@ -1085,10 +1054,6 @@ done
%dir %{_libexecdir}/systemtap
%{_libexecdir}/systemtap/libHelperSDT_*.so
%endif
%if %{with_bundled_elfutils}
%dir %{_libdir}/systemtap
%{_libdir}/systemtap/lib*.so*
%endif
%if %{with_emacsvim}
%{_emacs_sitelispdir}/*.el*
%{_emacs_sitestartdir}/systemtap-init.el
@ -1104,7 +1069,6 @@ done
%files runtime -f systemtap.lang
%defattr(-,root,root)
%attr(4110,root,stapusr) %{_bindir}/staprun
%{_bindir}/stapsh
%{_bindir}/stap-merge
@ -1140,7 +1104,6 @@ done
%files client -f systemtap.lang
%defattr(-,root,root)
%doc README README.unprivileged AUTHORS NEWS
%{_datadir}/systemtap/examples
%{!?_licensedir:%global license %%doc}
@ -1170,7 +1133,6 @@ done
%files initscript
%defattr(-,root,root)
%if %{with_systemd}
%{_unitdir}/systemtap.service
%{_sbindir}/systemtap-service
@ -1192,7 +1154,6 @@ done
%files sdt-devel
%defattr(-,root,root)
%{_bindir}/dtrace
%{_includedir}/sys/sdt.h
%{_includedir}/sys/sdt-config.h
@ -1204,7 +1165,6 @@ done
%files testsuite
%defattr(-,root,root)
%dir %{_datadir}/systemtap
%{_datadir}/systemtap/testsuite
@ -1249,10 +1209,12 @@ done
%endif
%if %{with_python3}
%files stap-exporter
%files exporter
%{_sysconfdir}/stap-exporter
%{_sysconfdir}/sysconfig/stap-exporter
%{_unitdir}/stap-exporter.service
%{_mandir}/man8/stap-exporter.8*
%{_bindir}/stap-exporter
%{_sbindir}/stap-exporter
%endif
# ------------------------------------------------------------------------
@ -1264,15 +1226,32 @@ done
# PRERELEASE
%changelog
* Fri Aug 10 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-0.20180810git
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 4.3-0.20200212git91ffb97ad335
- Rebuild (json-c)
* Tue Feb 11 2020 Frank Ch. Eigler <fche@redhat.com> - 4.3-0.20200211git91ffb97ad335
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Feb 03 2020 Frank Ch. Eigler <fche@redhat.com> - 4.3-0.20200203git6c0b74f5910a
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.3-2
- Rebuilt for Python 3.7
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-0.20200113gitb1e6a6645bba
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 12 2020 Frank Ch. Eigler <fche@redhat.com> - 4.3-0.20200112gitb1e6a6645bba
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Nov 18 2019 Sagar Patel <sapatel@redhat.com> - 4.2-1
- Upstream release.
* Tue May 07 2019 Serguei Makarov <smakarov@redhat.com> - 4.1-1
- Upstream release.
* Sat Oct 13 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-1
- Upstream release.
* Thu Jun 07 2018 Frank Ch. Eigler <fche@redhat.com> - 3.3-1
- Upstream release.

View File

@ -0,0 +1,38 @@
TOPLEVEL_NAMESPACE=fedora
PACKAGE_NAME=systemtap
RELATIVE_PATH=Sanity/dejagnu-smoketest
export TESTVERSION=1.0
export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
.PHONY: all install download clean
BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE
run: $(FILES) build
./runtest.sh
build: $(BUILT_FILES)
chmod a+x ./runtest.sh
clean:
rm -f *~ *.rpm $(BUILT_FILES)
include /usr/share/rhts/lib/rhts-make.include
# Generate the testinfo.desc here:
$(METADATA): Makefile
@touch $(METADATA)
# Change to the test owner's name
@echo "Owner: Frank Ch. Eigler <fche@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Type: Sanity" >> $(METADATA)
@echo "Description: smoke test" >> $(METADATA)
@echo "TestTime: 10m" >> $(METADATA)
@echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA)
@echo "Requires: $(PACKAGE_NAME)" >> $(METADATA)
@echo "License: GPLv2" >> $(METADATA)
# You may need other fields here; see the documentation
rhts-lint $(METADATA)

View File

@ -0,0 +1,3 @@
Test Name: dejagnu-smoketest
Author:
Short Description: Run a minimal systemtap testsuite

View File

@ -0,0 +1,17 @@
#!/bin/sh
set -e
set -x
dnf debuginfo-install -y kernel
# on Fedora CI, can only assume about 1GB RAM to run these tests
stap -L 'process("stap").mark("*")' | grep pass
# stap -L 'kernel.trace("sys_enter")'
stap -v --example helloworld.stp
stap -v -T 10 -p4 -e 'probe kernel.function("do_exit") {println($$vars)}'
# stap -v -T 10 -e 'probe syscall.* ? {println(argstr)}'
echo
echo RESULT: PASS

11
tests/tests.yml Normal file
View File

@ -0,0 +1,11 @@
---
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- classic
tests:
- dejagnu-smoketest
required_packages:
- systemtap-testsuite
- kernel-devel