The package rpms/systemtap.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/systemtap.git/commit/?id=84959d29....
Change:
+%ifarch i686
Thanks.
Full change:
============
commit 4be082b4dab7c692559f34cbec8cf44b0dc250eb
Author: Serguei Makarov <smakarov(a)redhat.com>
Date: Fri May 7 19:02:43 2021 -0400
upstream release 4.5
diff --git a/.gitignore b/.gitignore
index 3aa7e5f..720c02d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
/systemtap-4.5-0.202104140931gitad00fb87e.tar.gz
/systemtap-4.5-0.202104140933gitad00fb87e.tar.gz
/systemtap-4.5-0.202105041345git02b6be05fb76.tar.gz
+/systemtap-4.5.tar.gz
diff --git a/sources b/sources
index 3b316a1..9e90fe5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.5-0.202105041345git02b6be05fb76.tar.gz) =
5a91402979927039d04ca77aeb3432b7b2507ccc96a196c68430fbcb1162439653c656a51c9049e0ecf7c0fd212beb627a22f9a5e3e78aa36a4a92c4bb11df45
+SHA512 (systemtap-4.5.tar.gz) =
8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3
diff --git a/systemtap.spec b/systemtap.spec
index 5538cc4..3e933ea 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -90,7 +90,7 @@
Name: systemtap
Version: 4.5
-Release: 0.202105041345git02b6be05fb76%{?dist}
+Release: 1%{?release_override}%{?dist}
# for version, see also configure.ac
@@ -124,7 +124,7 @@ Release: 0.202105041345git02b6be05fb76%{?dist}
Summary: Programmable system-wide instrumentation system
License: GPLv2+
URL:
http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.202105041345git02b6be05fb76.tar.gz
+Source:
ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
# Build*
BuildRequires: make
@@ -1210,77 +1210,8 @@ exit 0
# PRERELEASE
%changelog
-* Tue May 04 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202105041345git02b6be05fb76
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Fri Apr 30 2021 Stan Cox <scox(a)redhat.com> - 4.5-0.202104300933gitad00fb87e
-- Rebuild for dyninst 11.0.0
-
-* Wed Apr 14 2021 Martin Cermak <mcermak(a)redhat.com> -
4.5-0.202104140933gitad00fb87e
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Wed Apr 14 2021 Martin Cermak <mcermak(a)redhat.com> -
4.5-0.202104140931gitad00fb87e
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Tue Feb 23 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202102231232git663a93e8b82b
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Fri Feb 19 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202102191905git0f623095ee3e
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Wed Feb 10 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202102101544git8d5e0abc542c
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Fri Jan 29 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202101291559git9e1a0f5703ad
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Fri Jan 29 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.20210129gitea81249b90b9
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Jan 28 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.20210128gita790dc64a9d8
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
4.5-0.20210109gita4d01e48d435
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Jonathan Wakely <jwakely(a)redhat.com> -
4.5-0.20210108gita4d01e48d435
-- Rebuilt for Boost 1.75
-
-* Thu Jan 07 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.20210107gita4d01e48d435
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Tue Jan 05 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.20210105git6cb54128e005
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Dec 10 2020 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.20201210gitd86b64029598
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Fri Dec 04 2020 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.20201204git0d80048e02ec
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Dec 03 2020 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.20201203git963c215e781e
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Dec 03 2020 Frank Ch. Eigler <fche(a)redhat.com> -
4.4-0.20201203gitf02f08bc6eff
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Nov 12 2020 Frank Ch. Eigler <fche(a)redhat.com> - 4.4-2
-- Respin with newer dyninst.
+* Fri May 07 2021 Serhei Makarov <me(a)serhei.io> - 4.5-1
+- Upstream release.
* Mon Nov 09 2020 Frank Ch. Eigler <fche(a)redhat.com> - 4.4-1
- Upstream release.
@@ -1322,7 +1253,7 @@ exit 0
- Upstream release.
* Mon Jul 07 2014 Josh Stone <jistone(a)redhat.com>
-- Flip with_dyninst to an %%ifarch whitelist.
+- Flip with_dyninst to an %%ifarch passlist.
* Wed Apr 30 2014 Jonathan Lebon <jlebon(a)redhat.com> - 2.5-1
- Upstream release.
commit 58ac083d93547c845fea2d0dccb69593ee6fb7f1
Author: Frank Ch. Eigler <fche(a)redhat.com>
Date: Tue May 4 17:31:17 2021 -0400
rpminspect tweaks: attempt to defang more tests
diff --git a/rpminspect.yaml b/rpminspect.yaml
index e7bed00..9ecef15 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -5,3 +5,22 @@ ownership:
ignore:
- /usr/bin/staprun
+# this SO is for JNI only, so annobin/etc. don't know what to do with it
+annocheck:
+ ignore:
+ - /usr/libexec/systemtap/libHelperSDT.so
+
+# bytecode version 43 vs 55 complaint is a misconfiguration according to msrb
+javabytecode:
+ ignore:
+ - /usr/libexec/systemtap/HelperSDT.jar
+
+# setuid binary
+permissions:
+ ignore:
+ - /usr/bin/staprun
+
+# some stap scripts are wrapped within /bin/sh that confuses rpminspect
+shellsyntax:
+ ignore:
+ - *.stp
commit 84959d29ef7576c7f3f982577e5c77ef9726dd6f
Author: Frank Ch. Eigler <fche(a)redhat.com>
Date: Tue May 4 13:45:21 2021 -0400
Automated weekly systemtap rawhide release: 0.202105041345git02b6be05fb76
diff --git a/.gitignore b/.gitignore
index aa8389e..3aa7e5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@
/systemtap-4.5-0.202102231232git663a93e8b82b.tar.gz
/systemtap-4.5-0.202104140931gitad00fb87e.tar.gz
/systemtap-4.5-0.202104140933gitad00fb87e.tar.gz
+/systemtap-4.5-0.202105041345git02b6be05fb76.tar.gz
diff --git a/sources b/sources
index e68576c..3b316a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.5-0.202104140933gitad00fb87e.tar.gz) =
d3af3972b1ef255e31fd84e3e41b3c7f76f474f5ace4940cbbe74427d4b04e9e8427ae1684a039174c963c11b4620ec7df2b050de8d35613183f377add8e07ea
+SHA512 (systemtap-4.5-0.202105041345git02b6be05fb76.tar.gz) =
5a91402979927039d04ca77aeb3432b7b2507ccc96a196c68430fbcb1162439653c656a51c9049e0ecf7c0fd212beb627a22f9a5e3e78aa36a4a92c4bb11df45
diff --git a/systemtap.spec b/systemtap.spec
index 2af1631..5538cc4 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -90,7 +90,7 @@
Name: systemtap
Version: 4.5
-Release: 0.202104300933gitad00fb87e%{?dist}
+Release: 0.202105041345git02b6be05fb76%{?dist}
# for version, see also configure.ac
@@ -124,7 +124,7 @@ Release: 0.202104300933gitad00fb87e%{?dist}
Summary: Programmable system-wide instrumentation system
License: GPLv2+
URL:
http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.202104140933gitad00fb87e.tar.gz
+Source: %{name}-%{version}-0.202105041345git02b6be05fb76.tar.gz
# Build*
BuildRequires: make
@@ -177,7 +177,7 @@ BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
BuildRequires: emacs
%endif
%if %{with_java}
-BuildRequires: jpackage-utils java-devel
+BuildRequires: java-devel
%endif
%if %{with_virthost}
# BuildRequires: libvirt-devel >= 1.0.2
@@ -373,6 +373,13 @@ Requires: dejagnu which elfutils grep nc
%if %{with_debuginfod}
Requires: elfutils-debuginfod
%endif
+# work around fedora ci gating kvetching about i686<->x86-64 conflicts
+%ifarch x86_64
+Conflicts: systemtap-testsuite = %{version}-%{release}.i686
+%endif
+%ifarch i686
+Conflicts: systemtap-testsuite = %{version}-%{release}.x86_64
+%endif
Requires: gcc gcc-c++ make glibc-devel
# testsuite/systemtap.base/ptrace.exp needs strace
Requires: strace
@@ -432,6 +439,13 @@ Summary: Systemtap Java Runtime Support
License: GPLv2+
URL:
http://sourceware.org/systemtap/
Requires: systemtap-runtime = %{version}-%{release}
+# work around fedora ci gating kvetching about i686<->x86-64 conflicts
+%ifarch x86_64
+Conflicts: systemtap-runtime = %{version}-%{release}.i686
+%endif
+%ifarch i686
+Conflicts: systemtap-runtime = %{version}-%{release}.x86_64
+%endif
Requires: byteman > 2.0
Requires: iproute
Requires: java-devel
@@ -967,58 +981,6 @@ exit 0
# ------------------------------------------------------------------------
-%if %{with_java}
-
-%triggerin runtime-java -- java-1.8.0-openjdk, java-1.7.0-openjdk, java-1.6.0-openjdk
-for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
- %ifarch %{ix86}
- arch=i386
- %else
- arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
- %endif
- for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
- if [ -d ${archdir} ]; then
- ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so
${archdir}/libHelperSDT_${arch}.so
- ln -sf %{_libexecdir}/systemtap/HelperSDT.jar
${archdir}/../ext/HelperSDT.jar
- fi
- done
-done
-
-%triggerun runtime-java -- java-1.8.0-openjdk, java-1.7.0-openjdk, java-1.6.0-openjdk
-for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
- %ifarch %{ix86}
- arch=i386
- %else
- arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
- %endif
- for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
- rm -f ${archdir}/libHelperSDT_${arch}.so
- rm -f ${archdir}/../ext/HelperSDT.jar
- done
-done
-
-%triggerpostun runtime-java -- java-1.8.0-openjdk, java-1.7.0-openjdk,
java-1.6.0-openjdk
-# Restore links for any JDKs remaining after a package removal:
-for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
- %ifarch %{ix86}
- arch=i386
- %else
- arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
- %endif
- for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
- if [ -d ${archdir} ]; then
- ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so
${archdir}/libHelperSDT_${arch}.so
- ln -sf %{_libexecdir}/systemtap/HelperSDT.jar
${archdir}/../ext/HelperSDT.jar
- fi
- done
-done
-
-# XXX: analogous support for other types of JRE/JDK??
-
-%endif
-
-# ------------------------------------------------------------------------
-
%files
# The main "systemtap" rpm doesn't include any files.
@@ -1074,7 +1036,7 @@ done
%license COPYING
%if %{with_java}
%dir %{_libexecdir}/systemtap
-%{_libexecdir}/systemtap/libHelperSDT_*.so
+%{_libexecdir}/systemtap/libHelperSDT.so
%endif
%if %{with_emacsvim}
%{_emacs_sitelispdir}/*.el*
@@ -1194,7 +1156,7 @@ done
%if %{with_java}
%files runtime-java
%dir %{_libexecdir}/systemtap
-%{_libexecdir}/systemtap/libHelperSDT_*.so
+%{_libexecdir}/systemtap/libHelperSDT.so
%{_libexecdir}/systemtap/HelperSDT.jar
%{_libexecdir}/systemtap/stapbm
%endif
@@ -1248,6 +1210,10 @@ done
# PRERELEASE
%changelog
+* Tue May 04 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202105041345git02b6be05fb76
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
* Fri Apr 30 2021 Stan Cox <scox(a)redhat.com> - 4.5-0.202104300933gitad00fb87e
- Rebuild for dyninst 11.0.0
commit a37d94ed8087c6660253e987d4bf50d4598b78d7
Author: Frank Ch. Eigler <fche(a)redhat.com>
Date: Mon May 3 12:30:05 2021 -0400
rpminspect: start adding permanent rpminspect waivers
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..e7bed00
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,7 @@
+
+
+# exclude ownership tests; we need setuid/gids as is
+ownership:
+ ignore:
+ - /usr/bin/staprun
+
commit 59f04a6c841e85572fbe07173663194d31cead22
Author: Martin Cermak <mcermak(a)redhat.com>
Date: Mon May 3 17:59:29 2021 +0200
Drop the baseos-qe.koji-build.scratch-build.validation testcase
diff --git a/gating.yaml b/gating.yaml
index 84b7773..ce3cdc1 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,7 +5,6 @@ decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
- - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
--- !Policy
product_versions:
- rhel-8
commit ded0a76ab1a6a0e0bf4863e216bbfa1db516fe80
Author: Stan Cox <scox(a)redhat.com>
Date: Fri Apr 30 10:18:12 2021 -0400
Rebuild for dyninst 11.0.0
diff --git a/systemtap.spec b/systemtap.spec
index b8b3988..2af1631 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -90,7 +90,7 @@
Name: systemtap
Version: 4.5
-Release: 0.202104140933gitad00fb87e%{?dist}
+Release: 0.202104300933gitad00fb87e%{?dist}
# for version, see also configure.ac
@@ -1248,6 +1248,9 @@ done
# PRERELEASE
%changelog
+* Fri Apr 30 2021 Stan Cox <scox(a)redhat.com> - 4.5-0.202104300933gitad00fb87e
+- Rebuild for dyninst 11.0.0
+
* Wed Apr 14 2021 Martin Cermak <mcermak(a)redhat.com> -
4.5-0.202104140933gitad00fb87e
- Automated weekly rawhide release
- Applied spec changes from upstream git
commit bd7878dd2323ec8a6b228242e3a44135d455d460
Author: Martin Cermak <mcermak(a)redhat.com>
Date: Wed Apr 14 17:02:36 2021 +0200
Introduce Fedora CI gating.
Introduce CI gating. This will introduce new testcase called
fedora-ci.koji-build.tier0.functional and will configure it
as a mandatory CI gating testcase for elfutils fedora builds.
The provided test case is executed by running ./runtest.sh.
The main.fmf file keeps the testcase metadata. The plans and
.fmf folders contain configuration files needed for execution
of provided testcases within the Fedora CI infrastructure.
The provided testcase relies upon the debuginfod server
providing needed kernel-debuginfo. It was tested with
staging instance of the debuginfod server running at
https://debuginfod.stg.fedoraproject.org/ .
Provided test uses Flexible Metadata Format, as documented in
https://fmf.readthedocs.io/ .
diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..84b7773
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,20 @@
+--- !Policy
+product_versions:
+ - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+ - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+ - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
+--- !Policy
+product_versions:
+ - rhel-8
+decision_context: osci_compose_gate
+rules:
+ - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+--- !Policy
+product_versions:
+ - rhel-9
+decision_context: osci_compose_gate
+rules:
+ - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..1ad2c12
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,6 @@
+summary: CI Gating Plan
+discover:
+ how: fmf
+ directory: tests
+execute:
+ how: beakerlib
diff --git a/tests/Sanity/quick-smoke-test/main.fmf
b/tests/Sanity/quick-smoke-test/main.fmf
new file mode 100644
index 0000000..0c8a945
--- /dev/null
+++ b/tests/Sanity/quick-smoke-test/main.fmf
@@ -0,0 +1,15 @@
+summary: Quick test that systemtap generally works
+description: ''
+contact:
+- Petr Muller <pmuller(a)redhat.com>
+component:
+- systemtap
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+- koji
+- systemtap
+- kernel-devel
+duration: 1h
+extra-summary: /tools/systemtap/Sanity/quick-smoke-test
+extra-task: /tools/systemtap/Sanity/quick-smoke-test
diff --git a/tests/Sanity/quick-smoke-test/runtest.sh
b/tests/Sanity/quick-smoke-test/runtest.sh
new file mode 100755
index 0000000..1381587
--- /dev/null
+++ b/tests/Sanity/quick-smoke-test/runtest.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# runtest.sh of /tools/systemtap/Sanity/quick-smoke-test
+
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+export
DEBUGINFOD_URLS="https://debuginfod.stg.fedoraproject.org/
$DEBUGINFOD_URLS"
+export DEBUGINFOD_TIMEOUT=300
+# export DEBUGINFOD_PROGRESS=1
+
+
+# On Rawhide, the running kernel packages won't probably be avail in
+# configured repos. Debuginfo isn't a problem, we access that using
+# the debuginfod.
+__install_deps ()
+{
+ set -xe
+ TMPD=$(mktemp -d)
+ pushd $TMPD
+ koji download-build --rpm kernel-`uname -r` --arch `uname -i`
+ koji download-build --rpm kernel-devel-`uname -r` --arch `uname -i`
+ koji download-build --rpm kernel-modules-`uname -r` --arch `uname -i`
+ dnf -y install kernel{,-devel,-modules}-`uname -r`.rpm
+ popd
+ rm -rf $TMPD
+ set +xe
+}
+
+rlJournalStart
+rlPhaseStartTest
+ rlRun "rpm -qa | egrep '^(kernel|systemtap)' | sort"
+ rlRun "uname -r"
+ rlRun "stap-prep || __install_deps"
+ rlRun "stap-prep"
+ rlRun "stap -L 'process(\"stap\").mark(\"*\")' |
grep pass"
+ rlRun "stap -v --example helloworld.stp"
+ rlRun "stap -v -T 10 -p4 -e 'probe kernel.function(\"do_exit\")
{println(\$\$vars)}'"
+ rlRun "stap -v -T 60 -e 'probe kernel.function(\"vfs_read\"){
println(\$\$vars); exit() }'"
+rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/dejagnu-smoketest/Makefile b/tests/dejagnu-smoketest/Makefile
deleted file mode 100644
index e212345..0000000
--- a/tests/dejagnu-smoketest/Makefile
+++ /dev/null
@@ -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(a)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)
diff --git a/tests/dejagnu-smoketest/PURPOSE b/tests/dejagnu-smoketest/PURPOSE
deleted file mode 100644
index 5a6a058..0000000
--- a/tests/dejagnu-smoketest/PURPOSE
+++ /dev/null
@@ -1,3 +0,0 @@
-Test Name: dejagnu-smoketest
-Author:
-Short Description: Run a minimal systemtap testsuite
diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh
deleted file mode 100755
index d988142..0000000
--- a/tests/dejagnu-smoketest/runtest.sh
+++ /dev/null
@@ -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
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 5d88e66..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- hosts: localhost
- roles:
- - role: standard-test-beakerlib
- tags:
- - classic
- tests:
- - dejagnu-smoketest
- required_packages:
- - systemtap-testsuite
- - kernel-devel
commit 849807987ac7201a173f8a00af6a45713f6acaf5
Author: Martin Cermak <mcermak(a)redhat.com>
Date: Wed Apr 14 09:33:39 2021 +0200
Automated weekly systemtap rawhide release: 0.202104140933gitad00fb87e
diff --git a/.gitignore b/.gitignore
index 58ff24d..aa8389e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@
/systemtap-4.5-0.202102191905git0f623095ee3e.tar.gz
/systemtap-4.5-0.202102231232git663a93e8b82b.tar.gz
/systemtap-4.5-0.202104140931gitad00fb87e.tar.gz
+/systemtap-4.5-0.202104140933gitad00fb87e.tar.gz
diff --git a/sources b/sources
index 970b603..e68576c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.5-0.202104140931gitad00fb87e.tar.gz) =
d3af3972b1ef255e31fd84e3e41b3c7f76f474f5ace4940cbbe74427d4b04e9e8427ae1684a039174c963c11b4620ec7df2b050de8d35613183f377add8e07ea
+SHA512 (systemtap-4.5-0.202104140933gitad00fb87e.tar.gz) =
d3af3972b1ef255e31fd84e3e41b3c7f76f474f5ace4940cbbe74427d4b04e9e8427ae1684a039174c963c11b4620ec7df2b050de8d35613183f377add8e07ea
diff --git a/systemtap.spec b/systemtap.spec
index 3717b61..b8b3988 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -90,7 +90,7 @@
Name: systemtap
Version: 4.5
-Release: 0.202104140931gitad00fb87e%{?dist}
+Release: 0.202104140933gitad00fb87e%{?dist}
# for version, see also configure.ac
@@ -124,7 +124,7 @@ Release: 0.202104140931gitad00fb87e%{?dist}
Summary: Programmable system-wide instrumentation system
License: GPLv2+
URL:
http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.202104140931gitad00fb87e.tar.gz
+Source: %{name}-%{version}-0.202104140933gitad00fb87e.tar.gz
# Build*
BuildRequires: make
@@ -1248,6 +1248,10 @@ done
# PRERELEASE
%changelog
+* Wed Apr 14 2021 Martin Cermak <mcermak(a)redhat.com> -
4.5-0.202104140933gitad00fb87e
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
* Wed Apr 14 2021 Martin Cermak <mcermak(a)redhat.com> -
4.5-0.202104140931gitad00fb87e
- Automated weekly rawhide release
- Applied spec changes from upstream git
commit 19272b877f17d42abf3fdea47fff822ce97d40ec
Author: Martin Cermak <mcermak(a)redhat.com>
Date: Wed Apr 14 09:32:01 2021 +0200
Automated weekly systemtap rawhide release: 0.202104140931gitad00fb87e
diff --git a/.gitignore b/.gitignore
index f7df360..58ff24d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@
/systemtap-4.5-0.202102101544git8d5e0abc542c.tar.gz
/systemtap-4.5-0.202102191905git0f623095ee3e.tar.gz
/systemtap-4.5-0.202102231232git663a93e8b82b.tar.gz
+/systemtap-4.5-0.202104140931gitad00fb87e.tar.gz
diff --git a/sources b/sources
index af2c754..970b603 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.5-0.202102231232git663a93e8b82b.tar.gz) =
203e22ad1b53bc342f2a41c8600f4ac97819bfed875d2e875dd5084f462577388bca8410c78176dbe8b6507dc98f8d3d334da9979c54528f3817af665f40aa30
+SHA512 (systemtap-4.5-0.202104140931gitad00fb87e.tar.gz) =
d3af3972b1ef255e31fd84e3e41b3c7f76f474f5ace4940cbbe74427d4b04e9e8427ae1684a039174c963c11b4620ec7df2b050de8d35613183f377add8e07ea
diff --git a/systemtap.spec b/systemtap.spec
index f223a16..3717b61 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -90,7 +90,7 @@
Name: systemtap
Version: 4.5
-Release: 0.202102231232git663a93e8b82b%{?dist}
+Release: 0.202104140931gitad00fb87e%{?dist}
# for version, see also configure.ac
@@ -124,7 +124,7 @@ Release: 0.202102231232git663a93e8b82b%{?dist}
Summary: Programmable system-wide instrumentation system
License: GPLv2+
URL:
http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.202102231232git663a93e8b82b.tar.gz
+Source: %{name}-%{version}-0.202104140931gitad00fb87e.tar.gz
# Build*
BuildRequires: make
@@ -166,9 +166,6 @@ 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}
# 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
@@ -1251,6 +1248,10 @@ done
# PRERELEASE
%changelog
+* Wed Apr 14 2021 Martin Cermak <mcermak(a)redhat.com> -
4.5-0.202104140931gitad00fb87e
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
* Tue Feb 23 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202102231232git663a93e8b82b
- Automated weekly rawhide release
- Applied spec changes from upstream git
commit 5ec38ccd7204f0dc8a0349c465ba5695787b1f12
Author: Frank Ch. Eigler <fche(a)redhat.com>
Date: Tue Feb 23 12:32:25 2021 -0500
Automated weekly systemtap rawhide release: 0.202102231232git663a93e8b82b
diff --git a/.gitignore b/.gitignore
index 5cf355a..f7df360 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@
/systemtap-4.5-0.202101291559git9e1a0f5703ad.tar.gz
/systemtap-4.5-0.202102101544git8d5e0abc542c.tar.gz
/systemtap-4.5-0.202102191905git0f623095ee3e.tar.gz
+/systemtap-4.5-0.202102231232git663a93e8b82b.tar.gz
diff --git a/sources b/sources
index 67b5082..af2c754 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.5-0.202102191905git0f623095ee3e.tar.gz) =
2f9d224a8870907a3bfcd6a9171d708b94d7867accf2d4d38f684f3286dd1e64744b584258d0e2efbc7fc1e9675138af48cd153f80536954999a3cce45f2d05d
+SHA512 (systemtap-4.5-0.202102231232git663a93e8b82b.tar.gz) =
203e22ad1b53bc342f2a41c8600f4ac97819bfed875d2e875dd5084f462577388bca8410c78176dbe8b6507dc98f8d3d334da9979c54528f3817af665f40aa30
diff --git a/systemtap.spec b/systemtap.spec
index 23e8d5e..f223a16 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -90,7 +90,7 @@
Name: systemtap
Version: 4.5
-Release: 0.202102191905git0f623095ee3e%{?dist}
+Release: 0.202102231232git663a93e8b82b%{?dist}
# for version, see also configure.ac
@@ -124,7 +124,7 @@ Release: 0.202102191905git0f623095ee3e%{?dist}
Summary: Programmable system-wide instrumentation system
License: GPLv2+
URL:
http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.202102191905git0f623095ee3e.tar.gz
+Source: %{name}-%{version}-0.202102231232git663a93e8b82b.tar.gz
# Build*
BuildRequires: make
@@ -406,7 +406,12 @@ Requires: systemtap-runtime-python2 = %{version}-%{release}
Requires: systemtap-runtime-python3 = %{version}-%{release}
%endif
%ifarch x86_64
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
+# fweimer, personal correspondence
+Recommends: glibc-devel(x86-32)
+%else
Requires: /usr/lib/libc.so
+%endif
# ... and /usr/lib/libgcc_s.so.*
# ... and /usr/lib/libstdc++.so.*
%endif
@@ -1246,6 +1251,10 @@ done
# PRERELEASE
%changelog
+* Tue Feb 23 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202102231232git663a93e8b82b
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
* Fri Feb 19 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202102191905git0f623095ee3e
- Automated weekly rawhide release
- Applied spec changes from upstream git
commit 2a603aada9cf72c3481a607ce5359db51c86d19b
Author: Frank Ch. Eigler <fche(a)redhat.com>
Date: Fri Feb 19 19:06:06 2021 -0500
Automated weekly systemtap rawhide release: 0.202102191905git0f623095ee3e
diff --git a/.gitignore b/.gitignore
index 746dd61..5cf355a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@
/systemtap-4.5-0.20210129gitea81249b90b9.tar.gz
/systemtap-4.5-0.202101291559git9e1a0f5703ad.tar.gz
/systemtap-4.5-0.202102101544git8d5e0abc542c.tar.gz
+/systemtap-4.5-0.202102191905git0f623095ee3e.tar.gz
diff --git a/sources b/sources
index 20d5f68..67b5082 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.5-0.202102101544git8d5e0abc542c.tar.gz) =
55377be780fb7861113bee77820684ddefb98c5ceb4cb16a4257766e325e76a6f5f028212b0a64efa5b19b26ee363a0b52a9a07dc8fa464470b21e008d0aa201
+SHA512 (systemtap-4.5-0.202102191905git0f623095ee3e.tar.gz) =
2f9d224a8870907a3bfcd6a9171d708b94d7867accf2d4d38f684f3286dd1e64744b584258d0e2efbc7fc1e9675138af48cd153f80536954999a3cce45f2d05d
diff --git a/systemtap.spec b/systemtap.spec
index b39c110..23e8d5e 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -10,7 +10,7 @@
%{!?with_crash: %global with_crash 1}
%endif
%{!?with_rpm: %global with_rpm 1}
-%{!?elfutils_version: %global elfutils_version 0.142}
+%{!?elfutils_version: %global elfutils_version 0.179}
%{!?pie_supported: %global pie_supported 1}
%{!?with_boost: %global with_boost 0}
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64
@@ -22,6 +22,7 @@
%{!?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_debuginfod: %global with_debuginfod 0%{?fedora} >= 25 || 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}
@@ -89,7 +90,7 @@
Name: systemtap
Version: 4.5
-Release: 0.202102101544git8d5e0abc542c%{?dist}
+Release: 0.202102191905git0f623095ee3e%{?dist}
# for version, see also configure.ac
@@ -123,7 +124,7 @@ Release: 0.202102101544git8d5e0abc542c%{?dist}
Summary: Programmable system-wide instrumentation system
License: GPLv2+
URL:
http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.202102101544git8d5e0abc542c.tar.gz
+Source: %{name}-%{version}-0.202102191905git0f623095ee3e.tar.gz
# Build*
BuildRequires: make
@@ -132,7 +133,9 @@ BuildRequires: cpio
BuildRequires: gettext-devel
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(avahi-client)
+%if %{with_debuginfod}
BuildRequires: pkgconfig(libdebuginfod)
+%endif
%if %{with_dyninst}
BuildRequires: dyninst-devel >= 10.0
BuildRequires: pkgconfig(libselinux)
@@ -264,6 +267,9 @@ Requires: kernel-devel-uname-r
%endif
Requires: gcc make
+# for compiling --runtime=dyninst sripts, need elfutils headers, bz1930973
+Requires: elfutils-devel >= %{elfutils_version}
+
Conflicts: systemtap-client < %{version}-%{release}
Conflicts: systemtap-server < %{version}-%{release}
Conflicts: systemtap-runtime < %{version}-%{release}
@@ -367,7 +373,9 @@ Requires: systemtap = %{version}-%{release}
Requires: systemtap-sdt-devel = %{version}-%{release}
Requires: systemtap-server = %{version}-%{release}
Requires: dejagnu which elfutils grep nc
+%if %{with_debuginfod}
Requires: elfutils-debuginfod
+%endif
Requires: gcc gcc-c++ make glibc-devel
# testsuite/systemtap.base/ptrace.exp needs strace
Requires: strace
@@ -529,6 +537,13 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
%global sqlite_config --disable-sqlite
%endif
+%if %{with_debuginfod}
+%global debuginfod_config --with-debuginfod
+%else
+%global debuginfod_config --without-debuginfod
+%endif
+
+
# Enable/disable the crash extension
%if %{with_crash}
%global crash_config --enable-crash
@@ -610,7 +625,7 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
# 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 %{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} %{debuginfod_config} --disable-silent-rules --with-extra-version="rpm
%{version}-%{release}"
make %{?_smp_mflags}
@@ -1231,6 +1246,10 @@ done
# PRERELEASE
%changelog
+* Fri Feb 19 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202102191905git0f623095ee3e
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
* Wed Feb 10 2021 Frank Ch. Eigler <fche(a)redhat.com> -
4.5-0.202102101544git8d5e0abc542c
- Automated weekly rawhide release
- Applied spec changes from upstream git