Compare commits

..

13 Commits
master ... f21

Author SHA1 Message Date
Frank Ch. Eigler 23d73dda24 Merge branch 'f23' into f21
* f23:
  upstream release 2.9
  Rebuilt for librpm soname bump
  Automated weekly systemtap rawhide release: 0.20150713git9d0b65f
  Automated weekly systemtap rawhide release: 0.20150707git86f726b
  Automated weekly systemtap rawhide release: 0.20150707git320e1ec

Conflicts:
	systemtap.spec
2015-10-08 22:02:36 -04:00
David Smith d0b86885a2 Prepare for the systemtap-2.8-2 release.
* systemtap.spec: Bump release number and add patch.
* systemtap-2.8-bz1240682.patch: New patch file.
* systemtap-2.6-compressed-modules.patch: Deleted.
* systemtap-2.6-dtrace-flexibility.patch: Deleted.
2015-09-16 15:53:54 -05:00
Frank Ch. Eigler 7a85d7fb7f Merge branch 'f22' into f21
* f22:
  drop -icf patch
2015-06-17 13:12:51 -04:00
Frank Ch. Eigler c1710625fc drop -icf patch 2015-06-17 13:08:56 -04:00
Frank Ch. Eigler 0c8ee78d92 Merge branch 'f22' into f21
* f22:
  systemtap 2.8 upstream release
  Automated weekly systemtap rawhide release: 0.20150601git1eed3df
  Automated weekly systemtap rawhide release: 0.20150525gita80691d
  Automated weekly systemtap rawhide release: 0.20150525git1f13f63
  Disable ICF when checking for available tracepoints.
  Automated weekly systemtap rawhide release: 0.20150504git6ca3ea7
  Automated weekly systemtap rawhide release: 0.20150427gitf80d9cd
  Automated weekly systemtap rawhide release: 0.20150420gitc054ce2
  Automated weekly systemtap rawhide release: 0.20150413git81e4501
  Automated weekly systemtap rawhide release: 0.20150330gitd31dab9
  Automated weekly systemtap rawhide release: 0.55.g07a1c230b47d
  Automated weekly systemtap rawhide release: 0.38.g3965aacd37c7
  Automated weekly systemtap rawhide release: 0.20.g784e796f37c8
  disable publican, pending bug triage
2015-06-17 12:52:10 -04:00
Frank Ch. Eigler 2a0f25d35c Merge branch 'master' into f22
* master:
  systemtap 2.8 upstream release
  Automated weekly systemtap rawhide release: 0.20150601git1eed3df
  Automated weekly systemtap rawhide release: 0.20150525gita80691d
  Automated weekly systemtap rawhide release: 0.20150525git1f13f63
  Automated weekly systemtap rawhide release: 0.20150504git6ca3ea7
  Automated weekly systemtap rawhide release: 0.20150427gitf80d9cd
  Automated weekly systemtap rawhide release: 0.20150420gitc054ce2
  Automated weekly systemtap rawhide release: 0.20150413git81e4501
  Automated weekly systemtap rawhide release: 0.20150330gitd31dab9
  Automated weekly systemtap rawhide release: 0.55.g07a1c230b47d
  Automated weekly systemtap rawhide release: 0.38.g3965aacd37c7
  Automated weekly systemtap rawhide release: 0.20.g784e796f37c8

Conflicts:
	systemtap.spec
2015-06-17 12:23:36 -04:00
Josh Stone 60a3632305 Disable ICF when checking for available tracepoints. 2015-05-12 12:06:15 -07:00
Frank Ch. Eigler eb58f6ada3 Merge branch 'master' into f21
* master: (27 commits)
  upstream release 2.7
  Automated weekly systemtap rawhide release: 0.284.gc1e8354302ba
  Automated weekly systemtap rawhide release: 0.244.gc1a369fb16d9
  Automated weekly systemtap rawhide release: 0.190.gfdffe7a8fc5f
  Automated weekly systemtap rawhide release: 0.168.g2df78f1c4927
  Automated weekly systemtap rawhide release: 0.160.gef8a28eb7412
  Automated weekly systemtap rawhide release: 0.156.g7cd3311e3288
  Automated weekly systemtap rawhide release: 0.131.g96ef4c2ab1ec
  Automated weekly systemtap rawhide release: 0.120.ge6f437adfe6d
  Automated weekly systemtap rawhide release: 0.117.g8ccd746013fa
  Automated weekly systemtap rawhide release: 0.103.gc1b1844eb23f
  Automated weekly systemtap rawhide release: 0.98.g08e54ea0a22d
  Automated weekly systemtap rawhide release: 0.93.g0cf3720fbd15
  Automated weekly systemtap rawhide release: 0.83.g69f0706dd69b
  Automated weekly systemtap rawhide release: 0.74.g6fb025aaaa35
  Automated weekly systemtap rawhide release: 0.70.g05b1f1672349
  Automated weekly systemtap rawhide release: 0.68.gdc7bb409c5b8
  Automated weekly systemtap rawhide release: 0.67.ga1a230af2ea5
  Automated weekly systemtap rawhide release: 0.63.g9c7a7069e302
  Automated weekly systemtap rawhide release: 0.41.g4c651caa69cf
  ...

Conflicts:
	.gitignore
	sources
	systemtap.spec
2015-02-18 16:13:10 -05:00
Josh Stone 2bec3b40b7 Handle compressed module filenames (rhbz1150166) 2014-10-07 13:17:27 -07:00
Josh Stone 06b57a477c Backport patches to improve dtrace's input flexibility
- Let dtrace use its old method if pyparsing fails (rhbz1131586)
- Allow dtrace -fPIC (rhbz1145993)
2014-09-25 11:21:41 -07:00
Josh Stone 716c0ac8a9 Upstream release. 2014-09-05 15:20:39 -07:00
Josh Stone 85599182e6 Merge remote-tracking branch 'origin/master' into f21
Updates "branched" f21 to the same snapshot as rawhide, and prepares to
be rebuilt on dyninst 8.2.0.

Conflicts:
	systemtap.spec
2014-08-20 13:43:03 -07:00
Peter Robinson 8890aaaad9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 04:41:05 +00:00
8 changed files with 324 additions and 485 deletions

198
.gitignore vendored
View File

@ -1,41 +1,157 @@
/systemtap-3.1.tar.gz
/systemtap-3.2-0.20170321git272146660f54.tar.gz
/systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz
/systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz
/systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz
/systemtap-3.2.tar.gz
/systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz
/systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz
/systemtap-3.3-0.20180420gitd4a446c.tar.gz
/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
systemtap-1.3.tar.gz
/systemtap-1.4.tar.gz
/systemtap-1.5.tar.gz
/systemtap-1.6.tar.gz
/systemtap-1.7.tar.gz
/systemtap-1.8.tar.gz
/systemtap-2.0pre-git10c737f.tar.gz
/systemtap-2.0pre-gitec12f84.tar.gz
/systemtap-2.0.tar.gz
/systemtap-2.1pre-git3df148c.tar.gz
/systemtap-2.1-0.48.g345f009.tar.gz
/systemtap-2.1-0.56.gf77181e.tar.gz
/systemtap-2.1-0.75.g02bff02.tar.gz
/systemtap-2.1-0.87.gf4b122a.tar.gz
/systemtap-2.1-0.97.g6a1a8f4.tar.gz
/systemtap-2.1-0.100.g0f3edcb.tar.gz
/systemtap-2.1-0.108.g6b378b7.tar.gz
/systemtap-2.1-0.119.g700d493.tar.gz
/systemtap-2.1-0.140.g05e94cf.tar.gz
/systemtap-2.1-0.141.g541343c.tar.gz
/systemtap-2.1-0.160.g63438a7.tar.gz
/systemtap-2.1-0.184.g6c9f0b7.tar.gz
/systemtap-2.1-0.185.g283159e.tar.gz
/systemtap-2.1-0.198.g4c5d990.tar.gz
/systemtap-2.1-0.204.gc43c0f8.tar.gz
/systemtap-2.1-0.244.g2c7281e.tar.gz
/systemtap-2.1-0.280.gbddba05.tar.gz
/systemtap-2.1-0.353.g43e1259.tar.gz
/systemtap-2.1-0.354.g75c7136.tar.gz
/systemtap-2.1-0.385.gab733d5.tar.gz
/systemtap-2.1.tar.gz
/systemtap-2.2-0.38.g65fef87.tar.gz
/systemtap-2.2-0.53.g019e44d.tar.gz
/systemtap-2.2-0.54.g2cc83f4.tar.gz
/systemtap-2.2-0.68.g8d23893.tar.gz
/systemtap-2.2-0.70.g23c2c25.tar.gz
/systemtap-2.2-0.74.gb1e0e10.tar.gz
/systemtap-2.2-0.84.g74fc0fe.tar.gz
/systemtap-2.2-0.94.g48bf64d.tar.gz
/systemtap-2.2-0.103.g5c607f5.tar.gz
/systemtap-2.2-0.104.gd142b86.tar.gz
/systemtap-2.2-0.104.gd142b86.1.tar.gz
/systemtap-2.2-0.112.g3d0dc3b.tar.gz
/systemtap-2.2-0.119.g1e447aa.tar.gz
/systemtap-2.2-0.125.ga88f5ee.tar.gz
/systemtap-2.2-0.127.g8ca891c.tar.gz
/systemtap-2.2-0.125.ga88f5ee.tar.gz
/systemtap-2.2.tar.gz
/systemtap-2.2.1.tar.gz
/systemtap-2.3-0.44.g2c10863.tar.gz
/systemtap-2.3-0.45.ge2a412f.tar.gz
/systemtap-2.3-0.48.g0d8d5d7.tar.gz
/systemtap-2.3-0.51.ge15a40c.tar.gz
/systemtap-2.3-0.89.g8571631.tar.gz
/systemtap-2.3-0.118.ge1c85da.tar.gz
/systemtap-2.3-0.152.g60c493c.tar.gz
/systemtap-2.3-0.170.g091f73b.tar.gz
/systemtap-2.3-0.204.g2759d5b.tar.gz
/systemtap-2.3-0.212.gaeb08b1.tar.gz
/systemtap-2.3-0.234.g54cbada.tar.gz
/systemtap-2.3-0.244.gca49ae2.tar.gz
/systemtap-2.3.tar.gz
/systemtap-2.4-0.9.geada930.tar.gz
/systemtap-2.4-0.19.g03207fd.tar.gz
/systemtap-2.4-0.25.g3f873e5.tar.gz
/systemtap-2.4-0.47.g2e9858c.tar.gz
/systemtap-2.4-0.81.g2b5bbe5.tar.gz
/systemtap-2.4-0.93.g892a56b.tar.gz
/systemtap-2.4-0.109.g217de68.tar.gz
/systemtap-2.4-0.127.g98df4da.tar.gz
/systemtap-2.4-0.131.g1acfc03.tar.gz
/systemtap-2.4-0.137.gbbb71aa.tar.gz
/systemtap-2.4-0.173.g2576d05.tar.gz
/systemtap-2.4-0.186.gc1cb76c.tar.gz
/systemtap-2.4-0.233.g5c0aabb.tar.gz
/systemtap-2.4.tar.gz
/systemtap-2.5-0.36.g1bbf3f9.tar.gz
/systemtap-2.5-0.47.gb72512c.tar.gz
/systemtap-2.5-0.70.g2200b70.tar.gz
/systemtap-2.5-0.78.ga7dd945a54f2.tar.gz
/systemtap-2.5-0.87.g540c750cf41f.tar.gz
/systemtap-2.5-0.123.gc60517ca2f99.tar.gz
/systemtap-2.5-0.151.g6ded984aa63f.tar.gz
/systemtap-2.5-0.185.g4a3f6fd34498.tar.gz
/systemtap-2.5-0.186.gf1753911ada8.tar.gz
/systemtap-2.5-0.191.g651a87924c22.tar.gz
/systemtap-2.5-0.239.g873c6f49b639.tar.gz
/systemtap-2.5-0.274.gde6aa5194bf4.tar.gz
/systemtap-2.5-0.294.g09c16468eb17.tar.gz
/systemtap-2.5-0.296.g4f53b72c1d47.tar.gz
/systemtap-2.5-0.318.g9ee1bfe9ac1c.tar.gz
/systemtap-2.5-0.349.g2dd920e34796.tar.gz
/systemtap-2.5-0.376.g450056a8faa6.tar.gz
/systemtap-2.5-0.415.g7caa63eb91fd.tar.gz
/systemtap-2.5-0.446.ga404e997732d.tar.gz
/systemtap-2.5-0.458.g15afd83e99da.tar.gz
/systemtap-2.5-0.491.gd0e1cd9d2fcb.tar.gz
/systemtap-2.5-0.535.g9d4241d37eb1.tar.gz
/systemtap-2.5.tar.gz
/systemtap-2.6-0.11.gbe329745a929.tar.gz
/systemtap-2.6-0.50.g684fe5014906.tar.gz
/systemtap-2.6-0.52.ge0da6e752b05.tar.gz
/systemtap-2.6-0.54.gb87b0305be62.tar.gz
/systemtap-2.6-0.62.gb50e1cd22c61.tar.gz
/systemtap-2.6-0.69.g27ce133c59da.tar.gz
/systemtap-2.6-0.112.g480ec383d00e.tar.gz
/systemtap-2.6-0.146.gc6c7b81a195e.tar.gz
/systemtap-2.6-0.175.gaa2eaf77df63.tar.gz
/systemtap-2.6-0.195.gc69af88fff8d.tar.gz
/systemtap-2.6-0.208.g035685897c43.tar.gz
/systemtap-2.6-0.240.g876abb05c522.tar.gz
/systemtap-2.6-0.299.gefa3ced615cc.tar.gz
/systemtap-2.6-0.411.gdf6c01e780a2.tar.gz
/systemtap-2.6.tar.gz
/systemtap-2.6-0.413.g6c14086f35f6.tar.gz
/systemtap-2.6-0.417.ga799c319d22f.tar.gz
/systemtap-2.6.tar.gz
/systemtap-2.7-0.1.ge4542435d372.tar.gz
/systemtap-2.7-0.18.gb8056bd23784.tar.gz
/systemtap-2.7-0.22.gf48e4f1c41b8.tar.gz
/systemtap-2.7-0.38.g3525152408f1.tar.gz
/systemtap-2.7-0.41.g4c651caa69cf.tar.gz
/systemtap-2.7-0.63.g9c7a7069e302.tar.gz
/systemtap-2.7-0.67.ga1a230af2ea5.tar.gz
/systemtap-2.7-0.68.gdc7bb409c5b8.tar.gz
/systemtap-2.7-0.70.g05b1f1672349.tar.gz
/systemtap-2.7-0.74.g6fb025aaaa35.tar.gz
/systemtap-2.7-0.83.g69f0706dd69b.tar.gz
/systemtap-2.7-0.93.g0cf3720fbd15.tar.gz
/systemtap-2.7-0.98.g08e54ea0a22d.tar.gz
/systemtap-2.7-0.103.gc1b1844eb23f.tar.gz
/systemtap-2.7-0.117.g8ccd746013fa.tar.gz
/systemtap-2.7-0.120.ge6f437adfe6d.tar.gz
/systemtap-2.7-0.131.g96ef4c2ab1ec.tar.gz
/systemtap-2.7-0.156.g7cd3311e3288.tar.gz
/systemtap-2.7-0.160.gef8a28eb7412.tar.gz
/systemtap-2.7-0.168.g2df78f1c4927.tar.gz
/systemtap-2.7-0.190.gfdffe7a8fc5f.tar.gz
/systemtap-2.7-0.244.gc1a369fb16d9.tar.gz
/systemtap-2.7-0.284.gc1e8354302ba.tar.gz
/systemtap-2.7.tar.gz
/systemtap-2.8-0.20.g784e796f37c8.tar.gz
/systemtap-2.8-0.38.g3965aacd37c7.tar.gz
/systemtap-2.8-0.55.g07a1c230b47d.tar.gz
/systemtap-2.8-0.20150330gitd31dab9.tar.gz
/systemtap-2.8-0.20150413git81e4501.tar.gz
/systemtap-2.8-0.20150420gitc054ce2.tar.gz
/systemtap-2.8-0.20150427gitf80d9cd.tar.gz
/systemtap-2.8-0.20150504git6ca3ea7.tar.gz
/systemtap-2.8-0.20150525git1f13f63.tar.gz
/systemtap-2.8-0.20150525gita80691d.tar.gz
/systemtap-2.8-0.20150601git1eed3df.tar.gz
/systemtap-2.8.tar.gz
/systemtap-2.9-0.20150707git320e1ec.tar.gz
/systemtap-2.9-0.20150707git86f726b.tar.gz
/systemtap-2.9-0.20150713git9d0b65f.tar.gz
/systemtap-2.9.tar.gz

View File

@ -1 +1 @@
SHA512 (systemtap-4.3-0.20200211git91ffb97ad335.tar.gz) = 449959f46a89633f57c20cbeb0ded7031587e6df7cf19c30a237bb1886a7235e066c2878023385a7ec83e6045ab31bc8819991574a5840c8080d2ea066974eb5
2f3c183966c82ec9d70c1de286b545fc systemtap-2.9.tar.gz

View File

@ -0,0 +1,33 @@
commit 320e1ecb16427b5769f0f5a097d80823ee1fb765
Author: David Smith <dsmith@redhat.com>
Date: Tue Jul 7 10:41:43 2015 -0500
Fixed BZ1240682 by fixing a rawhide compile problem.
* translate.cxx (translate_pass): Move the inclusion of runtime.h up
before the declaration of the module refresh mutex, to avoid compilation
problems on rawhide.
diff --git a/translate.cxx b/translate.cxx
index c8230f2..390a73e 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -7944,6 +7944,9 @@ translate_pass (systemtap_session& s)
// Emit systemtap_module_refresh() prototype so we can reference it
s.op->newline() << "static void systemtap_module_refresh (const char* modname);";
+ // Be sure to include runtime.h before any real code.
+ s.op->newline() << "#include \"runtime.h\"";
+
if (!s.runtime_usermode_p())
{
// When on-the-fly [dis]arming is used, module_refresh can be called from
@@ -7962,8 +7965,6 @@ translate_pass (systemtap_session& s)
s.op->newline() << "#endif";
}
- s.op->newline() << "#include \"runtime.h\"";
-
// Emit embeds ahead of time, in case they affect context layout
for (unsigned i=0; i<s.embeds.size(); i++)
{

View File

@ -1,30 +1,27 @@
%{!?with_sqlite: %global with_sqlite 0%{?fedora} >= 17 || 0%{?rhel} >= 7}
# prefer prebuilt docs
%{!?with_docs: %global with_docs 0}
%{!?with_htmldocs: %global with_htmldocs 0}
%{!?with_monitor: %global with_monitor 1}
%{!?with_sqlite: %global with_sqlite 1}
%{!?with_docs: %global with_docs 1}
# crash is not available
%ifarch ppc ppc64 %{sparc} %{mips}
%ifarch ppc ppc64 %{sparc} aarch64 ppc64le
%{!?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 ppc64le aarch64
%ifarch %{ix86} x86_64 ppc ppc64
%{!?with_dyninst: %global with_dyninst 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
%else
%{!?with_dyninst: %global with_dyninst 0}
%endif
%{!?with_bpf: %global with_bpf 0%{?fedora} >= 22 || 0%{?rhel} >= 8}
%{!?with_systemd: %global with_systemd 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
%{!?with_emacsvim: %global with_emacsvim 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
%{!?with_java: %global with_java 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
%{!?with_virthost: %global with_virthost 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
%{!?with_virtguest: %global with_virtguest 1}
%{!?with_dracut: %global with_dracut 0%{?fedora} >= 19 || 0%{?rhel} >= 6}
%{!?with_dracut: %global with_dracut 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
%ifarch x86_64
%{!?with_mokutil: %global with_mokutil 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
%{!?with_openssl: %global with_openssl 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
@ -33,18 +30,11 @@
%{!?with_openssl: %global with_openssl 0}
%endif
%{!?with_pyparsing: %global with_pyparsing 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
%{!?with_python3: %global with_python3 0%{?fedora} >= 23 || 0%{?rhel} > 7}
%{!?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}
%{!?with_python3: %global with_python3 0%{?fedora} >= 23}
# 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}
@ -64,30 +54,11 @@
%endif
%endif
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
%define dracutstap %{_prefix}/lib/dracut/modules.d/99stap
%else
%define dracutstap %{_prefix}/share/dracut/modules.d/99stap
%endif
%if 0%{?rhel} == 6 || 0%{?rhel} == 7
%define dracutbindir /sbin
%else
%define dracutbindir %{_bindir}
%endif
%if 0%{?rhel} == 6
%{!?_rpmmacrodir: %define _rpmmacrodir /etc/rpm/}
%else
%{!?_rpmmacrodir: %define _rpmmacrodir %{_rpmconfigdir}/macros.d}
%endif
# To avoid testsuite/*/*.stp has shebang which doesn't start with '/'
%define __brp_mangle_shebangs_exclude_from .stp$
%define dracutstap %{_prefix}/lib/dracut/modules.d/99stap
Name: systemtap
Version: 4.3
Release: 0.20200212git91ffb97ad335%{?dist}
Version: 2.9
Release: 1%{?dist}
# for version, see also configure.ac
@ -104,8 +75,6 @@ Release: 0.20200212git91ffb97ad335%{?dist}
# systemtap-runtime-java libHelperSDT.so, HelperSDT.jar, stapbm, req:-runtime
# systemtap-runtime-virthost /usr/bin/stapvirt, req:libvirt req:libxml2
# systemtap-runtime-virtguest udev rules, init scripts/systemd service, req:-runtime
# systemtap-runtime-python2 HelperSDT python2 module, req:-runtime
# systemtap-runtime-python3 HelperSDT python3 module, req:-runtime
#
# Typical scenarios:
#
@ -119,29 +88,22 @@ Release: 0.20200212git91ffb97ad335%{?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.20200211git91ffb97ad335.tar.gz
Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
# Build*
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-c++
BuildRequires: cpio
BuildRequires: gettext-devel
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(avahi-client)
BuildRequires: nss-devel avahi-devel pkgconfig
%if %{with_dyninst}
BuildRequires: dyninst-devel >= 10.0
BuildRequires: pkgconfig(libselinux)
BuildRequires: dyninst-devel >= 8.0
BuildRequires: libselinux-devel
%endif
%if %{with_sqlite}
BuildRequires: sqlite-devel > 3.7
%endif
%if %{with_monitor}
BuildRequires: pkgconfig(json-c)
BuildRequires: pkgconfig(ncurses)
%endif
%if %{with_systemd}
BuildRequires: systemd
BuildRequires: sqlite-devel
%endif
# Needed for libstd++ < 4.0, without <tr1/memory>
%if %{with_boost}
@ -151,24 +113,26 @@ BuildRequires: boost-devel
BuildRequires: crash-devel zlib-devel
%endif
%if %{with_rpm}
BuildRequires: rpm-devel
BuildRequires: rpm-devel glibc-headers
%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}
%if %{with_docs}
BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
BuildRequires: tex(fullpage.sty) tex(fancybox.sty) tex(bchr7t.tfm) tex(graphicx.sty)
%endif
# For the html.sty mentioned in the .tex files, even though latex2html is
# not run during the build, only during manual scripts/update-docs runs:
BuildRequires: latex2html
%if %{with_htmldocs}
%if %{with_docs}
BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
BuildRequires: tex(fullpage.sty) tex(fancybox.sty) tex(bchr7t.tfm)
%endif
# 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
%endif
%if %{with_emacsvim}
BuildRequires: emacs
%endif
@ -176,33 +140,8 @@ BuildRequires: emacs
BuildRequires: jpackage-utils java-devel
%endif
%if %{with_virthost}
# BuildRequires: libvirt-devel >= 1.0.2
BuildRequires: pkgconfig(libvirt)
BuildRequires: pkgconfig(libxml-2.0)
%endif
BuildRequires: readline-devel
%if 0%{?rhel} <= 5
BuildRequires: pkgconfig(ncurses)
%endif
%if %{with_python2_probes}
BuildRequires: python2-devel
%if 0%{?fedora} >= 1
BuildRequires: python2-setuptools
%else
BuildRequires: python-setuptools
%endif
%endif
%if %{with_python3_probes}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
%endif
%if %{with_specific_python}
BuildRequires: /usr/bin/pathfix.py
%endif
%if %{with_httpd}
BuildRequires: libmicrohttpd-devel
BuildRequires: libuuid-devel
BuildRequires: libvirt-devel >= 1.0.2
BuildRequires: libxml2-devel
%endif
# Install requirements
@ -219,26 +158,23 @@ 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}
Conflicts: systemtap-devel < %{version}-%{release}
Conflicts: systemtap-runtime < %{version}-%{release}
Conflicts: systemtap-client < %{version}-%{release}
Requires: nss coreutils
# On RHEL[45], /bin/mktemp comes from the 'mktemp' package. On newer
# distributions, /bin/mktemp comes from the 'coreutils' package. To
# avoid a specific RHEL[45] Requires, we'll do a file-based require.
Requires: nss /bin/mktemp
Requires: zip unzip
Requires(pre): shadow-utils
BuildRequires: nss-devel avahi-devel
%if %{with_openssl}
Requires: openssl
%endif
%if %{with_systemd}
Requires: systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
BuildRequires: nss-devel avahi-devel
%if %{with_openssl}
Requires: openssl
%endif
%description server
@ -249,20 +185,14 @@ 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/
%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
%endif
# Alternate kernel packages kernel-PAE-devel et al. have a virtual
# provide for kernel-devel, so this requirement does the right thing,
# at least past RHEL4.
Requires: kernel-devel
Requires: gcc make
Conflicts: systemtap-client < %{version}-%{release}
Conflicts: systemtap-server < %{version}-%{release}
Conflicts: systemtap-runtime < %{version}-%{release}
# Suggest: kernel-debuginfo
%description devel
@ -276,12 +206,10 @@ 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
Conflicts: systemtap-devel < %{version}-%{release}
Conflicts: systemtap-server < %{version}-%{release}
Conflicts: systemtap-client < %{version}-%{release}
%description runtime
SystemTap runtime contains the components needed to execute
@ -291,15 +219,13 @@ 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
Requires: systemtap-runtime = %{version}-%{release}
Requires: coreutils grep sed unzip zip
Requires: openssh-clients
Conflicts: systemtap-devel < %{version}-%{release}
Conflicts: systemtap-server < %{version}-%{release}
Conflicts: systemtap-runtime < %{version}-%{release}
%if %{with_mokutil}
Requires: mokutil
%endif
@ -314,17 +240,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}
%if %{with_systemd}
Requires: systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
%endif
%description initscript
This package includes a SysVinit script to launch selected systemtap
@ -334,17 +257,14 @@ 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}
%if %{with_python3}
Requires: python3-pyparsing
%else
%if 0%{?rhel} >= 7
Requires: pyparsing
%else
Requires: python2-pyparsing
%endif
%endif
%endif
@ -357,6 +277,7 @@ 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}
@ -386,12 +307,6 @@ Requires: crash
%if %{with_java}
Requires: systemtap-runtime-java = %{version}-%{release}
%endif
%if %{with_python2_probes}
Requires: systemtap-runtime-python2 = %{version}-%{release}
%endif
%if %{with_python3_probes}
Requires: systemtap-runtime-python3 = %{version}-%{release}
%endif
%ifarch x86_64
Requires: /usr/lib/libc.so
# ... and /usr/lib/libgcc_s.so.*
@ -400,10 +315,6 @@ Requires: /usr/lib/libc.so
%if 0%{?fedora} >= 18
Requires: stress
%endif
# The following "meta" files for the systemtap examples run "perf":
# testsuite/systemtap.examples/hw_watch_addr.meta
# testsuite/systemtap.examples/memory/hw_watch_sym.meta
Requires: perf
%description testsuite
This package includes the dejagnu-based systemtap stress self-testing
@ -414,63 +325,23 @@ 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
Requires: net-tools
%description runtime-java
This package includes support files needed to run systemtap scripts
that probe Java processes running on the OpenJDK runtimes using Byteman.
%endif
%if %{with_python2_probes}
%package runtime-python2
Summary: Systemtap Python 2 Runtime Support
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
%description runtime-python2
This package includes support files needed to run systemtap scripts
that probe python 2 processes.
%endif
%if %{with_python3_probes}
%package runtime-python3
Summary: Systemtap Python 3 Runtime Support
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
%if ! (%{with_python2_probes})
# Provide an clean upgrade path when the python2 package is removed
Obsoletes: %{name}-runtime-python2 < %{version}-%{release}
%endif
%description runtime-python3
This package includes support files needed to run systemtap scripts
that probe python 3 processes.
%endif
%if %{with_python3}
%package exporter
Summary: Systemtap-prometheus interoperation mechanism
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
%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.
that probe Java processes running on the OpenJDK 1.6 and OpenJDK 1.7
runtimes using Byteman.
%endif
%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
@ -485,6 +356,7 @@ 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}
@ -506,10 +378,35 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
# ------------------------------------------------------------------------
%prep
%setup -q
%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.
%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
@ -539,13 +436,9 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
%endif
%if %{with_docs}
%if %{with_htmldocs}
%global docs_config --enable-docs --enable-htmldocs
%global docs_config --enable-docs
%else
%global docs_config --enable-docs --disable-htmldocs
%endif
%else
%global docs_config --enable-docs=prebuilt
%global docs_config --disable-docs
%endif
# Enable pie as configure defaults to disabling it
@ -562,22 +455,6 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
%global java_config --without-java
%endif
%if %{with_python3}
%global python3_config --with-python3
%else
%global python3_config --without-python3
%endif
%if %{with_python2_probes}
%global python2_probes_config --with-python2-probes
%else
%global python2_probes_config --without-python2-probes
%endif
%if %{with_python3_probes}
%global python3_probes_config --with-python3-probes
%else
%global python3_probes_config --without-python3-probes
%endif
%if %{with_virthost}
%global virt_config --enable-virt
%else
@ -585,43 +462,37 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
%endif
%if %{with_dracut}
%global dracut_config --with-dracutstap=%{dracutstap} --with-dracutbindir=%{dracutbindir}
%global dracut_config --with-dracutstap=%{dracutstap}
%else
%global dracut_config %{nil}
%global dracut_config
%endif
%if %{with_httpd}
%global httpd_config --enable-httpd
%if %{with_python3}
%global python3_config --with-python3
%else
%global httpd_config --disable-httpd
%global python3_config --without-python3
%endif
%if %{with_bpf}
%global bpf_config --with-bpf
%else
%global bpf_config --without-bpf
%endif
# We don't ship compileworthy python code, just oddball samples
%global py_auto_byte_compile 0
%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}"
%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_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
dir=$(echo $dir | sed -e "s|^$RPM_BUILD_ROOT||")
lang=$(basename $dir)
echo "%%lang($lang) $dir/man*/*" >> %{name}.lang
done
ln -s %{_datadir}/systemtap/examples
# 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 scripts.
find $RPM_BUILD_ROOT%{_datadir}/systemtap/examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
# 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 make rpmlint happy, remove any .gitignore files in the testsuite.
find testsuite -type f -name '.gitignore' -print0 | xargs -0 rm -f
@ -638,20 +509,16 @@ install -c -m 755 stap-prep $RPM_BUILD_ROOT%{_bindir}/stap-prep
# 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.
# 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/
%if %{with_docs}
%if %{with_htmldocs}
mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/tapsets docs.installed/
mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/SystemTap_Beginners_Guide docs.installed/
%endif
%endif
install -D -m 644 macros.systemtap $RPM_BUILD_ROOT%{_rpmmacrodir}/macros.systemtap
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/stap-server
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/stap-server
@ -662,27 +529,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/systemtap
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/systemtap
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -m 644 initscript/logrotate.stap-server $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/stap-server
# If using systemd systemtap.service file, retain the old init script in %{_libexecdir} as a helper.
%if %{with_systemd}
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
touch $RPM_BUILD_ROOT%{_unitdir}/systemtap.service
install -m 644 initscript/systemtap.service $RPM_BUILD_ROOT%{_unitdir}/systemtap.service
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -m 755 initscript/systemtap $RPM_BUILD_ROOT%{_sbindir}/systemtap-service
%else
mkdir -p $RPM_BUILD_ROOT%{initdir}
install -m 755 initscript/systemtap $RPM_BUILD_ROOT%{initdir}
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
ln -sf %{initdir}/systemtap $RPM_BUILD_ROOT%{_sbindir}/systemtap-service
# TODO CHECK CORRECTNESS: symlink %{_sbindir}/systemtap-service to %{initdir}/systemtap
%endif
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.systemtap $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/config
%if %{with_systemd}
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
touch $RPM_BUILD_ROOT%{_unitdir}/stap-server.service
@ -729,38 +581,25 @@ done
%if %{with_dracut}
mkdir -p $RPM_BUILD_ROOT%{dracutstap}
install -p -m 755 initscript/99stap/module-setup.sh $RPM_BUILD_ROOT%{dracutstap}
install -p -m 755 initscript/99stap/install $RPM_BUILD_ROOT%{dracutstap}
install -p -m 755 initscript/99stap/check $RPM_BUILD_ROOT%{dracutstap}
install -p -m 755 initscript/99stap/start-staprun.sh $RPM_BUILD_ROOT%{dracutstap}
touch $RPM_BUILD_ROOT%{dracutstap}/params.conf
%endif
%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
%clean
rm -rf ${RPM_BUILD_ROOT}
%pre runtime
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
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
exit 0
%pre server
getent group stap-server >/dev/null || groupadd -f -g 155 -r stap-server
getent group stap-server >/dev/null || groupadd -g 155 -r stap-server 2>/dev/null || groupadd -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
%pre testsuite
getent passwd stapusr >/dev/null || \
useradd -c "Systemtap 'stapusr' User" -g stapusr -r -s /sbin/nologin stapusr
getent passwd stapsys >/dev/null || \
useradd -c "Systemtap 'stapsys' User" -g stapsys -G stapusr -r -s /sbin/nologin stapsys
getent passwd stapdev >/dev/null || \
useradd -c "Systemtap 'stapdev' User" -g stapdev -G stapusr -r -s /sbin/nologin stapdev
exit 0
%post server
# We have some duplication between the %files listings for the
@ -788,6 +627,11 @@ test -e %{_localstatedir}/log/stap-server/log || {
chmod 644 %{_localstatedir}/log/stap-server/log
chown stap-server:stap-server %{_localstatedir}/log/stap-server/log
}
# If it does not already exist, as stap-server, generate the certificate
# used for signing and for ssl.
if test ! -e ~stap-server/.systemtap/ssl/server/stap.cert; then
runuser -s /bin/sh - stap-server -c %{_libexecdir}/systemtap/stap-gen-cert >/dev/null
fi
# Prepare the service
%if %{with_systemd}
# Note, Fedora policy doesn't allow network services enabled by default
@ -915,24 +759,6 @@ if [ "$1" -ge "1" ]; then
fi
exit 0
%if %{with_python3}
%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
(make -C %{_datadir}/systemtap/runtime/uprobes clean) >/dev/null 2>&1 || true
@ -997,10 +823,11 @@ done
# ------------------------------------------------------------------------
%files
%files -f systemtap.lang
# 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
@ -1054,21 +881,19 @@ 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
%{_datadir}/vim/vimfiles/*/*.vim
%endif
# Notice that the stap-resolve-module-function.py file is used by
# *both* the python2 and python3 subrpms. Both subrpms use that same
# python script to help list python probes.
%if %{with_python3_probes} || %{with_python2_probes}
%{_libexecdir}/systemtap/python/stap-resolve-module-function.py
%exclude %{_libexecdir}/systemtap/python/stap-resolve-module-function.py?
%endif
%files runtime -f systemtap.lang
%defattr(-,root,root)
%attr(4110,root,stapusr) %{_bindir}/staprun
%{_bindir}/stapsh
%{_bindir}/stap-merge
@ -1076,9 +901,6 @@ done
%if %{with_dyninst}
%{_bindir}/stapdyn
%endif
%if %{with_bpf}
%{_bindir}/stapbpf
%endif
%dir %{_libexecdir}/systemtap
%{_libexecdir}/systemtap/stapio
%{_libexecdir}/systemtap/stap-authorize-cert
@ -1095,26 +917,21 @@ done
%if %{with_dyninst}
%{_mandir}/man8/stapdyn.8*
%endif
%if %{with_bpf}
%{_mandir}/man8/stapbpf.8*
%endif
%doc README README.security AUTHORS NEWS
%{!?_licensedir:%global license %%doc}
%license COPYING
%files client -f systemtap.lang
%doc README README.unprivileged AUTHORS NEWS
%{_datadir}/systemtap/examples
%defattr(-,root,root)
%doc README README.unprivileged AUTHORS NEWS examples
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc docs.installed/*.pdf
%if %{with_docs}
%if %{with_htmldocs}
%doc docs.installed/*.pdf
%doc docs.installed/tapsets/*.html
%doc docs.installed/SystemTap_Beginners_Guide
%endif
%endif
%{_bindir}/stap
%{_bindir}/stap-prep
%{_bindir}/stap-report
@ -1133,20 +950,15 @@ done
%files initscript
%if %{with_systemd}
%{_unitdir}/systemtap.service
%{_sbindir}/systemtap-service
%else
%defattr(-,root,root)
%{initdir}/systemtap
%{_sbindir}/systemtap-service
%endif
%dir %{_sysconfdir}/systemtap
%dir %{_sysconfdir}/systemtap/conf.d
%dir %{_sysconfdir}/systemtap/script.d
%config(noreplace) %{_sysconfdir}/systemtap/config
%dir %{_localstatedir}/cache/systemtap
%ghost %{_localstatedir}/run/systemtap
%{_mandir}/man8/systemtap-service.8*
%{_mandir}/man8/systemtap.8*
%if %{with_dracut}
%dir %{dracutstap}
%{dracutstap}/*
@ -1154,17 +966,18 @@ done
%files sdt-devel
%defattr(-,root,root)
%{_bindir}/dtrace
%{_includedir}/sys/sdt.h
%{_includedir}/sys/sdt-config.h
%{_mandir}/man1/dtrace.1*
%{_rpmmacrodir}/macros.systemtap
%doc README AUTHORS NEWS
%{!?_licensedir:%global license %%doc}
%license COPYING
%files testsuite
%defattr(-,root,root)
%dir %{_datadir}/systemtap
%{_datadir}/systemtap/testsuite
@ -1177,17 +990,6 @@ done
%{_libexecdir}/systemtap/stapbm
%endif
%if %{with_python2_probes}
%files runtime-python2
%{python_sitearch}/HelperSDT
%{python_sitearch}/HelperSDT-*.egg-info
%endif
%if %{with_python3_probes}
%files runtime-python3
%{python3_sitearch}/HelperSDT
%{python3_sitearch}/HelperSDT-*.egg-info
%endif
%if %{with_virthost}
%files runtime-virthost
%{_mandir}/man1/stapvirt.1*
@ -1208,15 +1010,6 @@ done
%endif
%endif
%if %{with_python3}
%files exporter
%{_sysconfdir}/stap-exporter
%{_sysconfdir}/sysconfig/stap-exporter
%{_unitdir}/stap-exporter.service
%{_mandir}/man8/stap-exporter.8*
%{_sbindir}/stap-exporter
%endif
# ------------------------------------------------------------------------
# Future new-release entries should be of the form
@ -1224,53 +1017,19 @@ done
# - Upstream release, see wiki page below for detailed notes.
# http://sourceware.org/systemtap/wiki/SystemTapReleases
# PRERELEASE
%changelog
* 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
* Mon Feb 03 2020 Frank Ch. Eigler <fche@redhat.com> - 4.3-0.20200203git6c0b74f5910a
- Automated weekly rawhide release
- Applied spec changes from upstream git
* 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.
* Wed Oct 18 2017 Frank Ch. Eigler <fche@redhat.com> - 3.2-1
- Upstream release.
* Fri Feb 17 2017 Frank Ch. Eigler <fche@redhat.com> - 3.1-1
- Upstream release.
* Sun Mar 27 2016 Frank Ch. Eigler <fche@redhat.com> - 3.0-1
- Upstream release.
* Thu Oct 08 2015 Frank Ch. Eigler <fche@redhat.com> - 2.9-1
- Upstream release.
* Wed Sep 16 2015 David Smith <dsmith@redhat.com> - 2.8-2
- Fix support for kernel 4.2 (BZ1240682).
* Wed Jun 17 2015 Abegail Jakop <ajakop@redhat.com> - 2.8-1
- Upstream release.
* Tue May 12 2015 Josh Stone <jistone@redhat.com> - 2.7-2
- Disable ICF when checking for available tracepoints.
* Wed Feb 18 2015 Frank Ch. Eigler <fche@redhat.com> - 2.7-1
- Upstream release.
@ -1278,7 +1037,7 @@ done
- Upstream release.
* Mon Jul 07 2014 Josh Stone <jistone@redhat.com>
- Flip with_dyninst to an %%ifarch whitelist.
- Flip with_dyninst to an %ifarch whitelist.
* Wed Apr 30 2014 Jonathan Lebon <jlebon@redhat.com> - 2.5-1
- Upstream release.

View File

@ -1,38 +0,0 @@
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

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

View File

@ -1,17 +0,0 @@
#!/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

View File

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