Resolves: rhbz1953754
This commit is contained in:
Frank Ch. Eigler
parent
76114e2705
commit
6d3d6e883a
1
.gitignore
vendored
1
.gitignore
vendored
@ -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.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (systemtap-4.5-0.202102101544git8d5e0abc542c.tar.gz) = 55377be780fb7861113bee77820684ddefb98c5ceb4cb16a4257766e325e76a6f5f028212b0a64efa5b19b26ee363a0b52a9a07dc8fa464470b21e008d0aa201
|
||||
SHA512 (systemtap-4.5.tar.gz) = 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3
|
||||
|
||||
157
systemtap.spec
157
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.202102101545git8d5e0abc542c%{?dist}
|
||||
Release: 1%{?release_override}%{?dist}
|
||||
# for version, see also configure.ac
|
||||
|
||||
|
||||
@ -123,7 +124,7 @@ Release: 0.202102101545git8d5e0abc542c%{?dist}
|
||||
Summary: Programmable system-wide instrumentation system
|
||||
License: GPLv2+
|
||||
URL: http://sourceware.org/systemtap/
|
||||
Source: %{name}-%{version}-0.202102101544git8d5e0abc542c.tar.gz
|
||||
Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.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)
|
||||
@ -163,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
|
||||
@ -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
|
||||
@ -264,6 +264,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 +370,16 @@ 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
|
||||
# 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
|
||||
@ -398,7 +410,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
|
||||
@ -422,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
|
||||
@ -529,6 +553,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 +641,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}
|
||||
|
||||
|
||||
@ -950,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.
|
||||
|
||||
@ -1057,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*
|
||||
@ -1177,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
|
||||
@ -1231,58 +1210,12 @@ done
|
||||
|
||||
# PRERELEASE
|
||||
%changelog
|
||||
* Fri May 07 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-1
|
||||
- Upstream release.
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.5-0.202102101545git8d5e0abc542c
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Feb 10 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.202102101544git8d5e0abc542c
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Fri Jan 29 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.202101291559git9e1a0f5703ad
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Fri Jan 29 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.20210129gitea81249b90b9
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Thu Jan 28 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.20210128gita790dc64a9d8
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.5-0.20210109gita4d01e48d435
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 4.5-0.20210108gita4d01e48d435
|
||||
- Rebuilt for Boost 1.75
|
||||
|
||||
* Thu Jan 07 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.20210107gita4d01e48d435
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Tue Jan 05 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.20210105git6cb54128e005
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Thu Dec 10 2020 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.20201210gitd86b64029598
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Fri Dec 04 2020 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.20201204git0d80048e02ec
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Thu Dec 03 2020 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.20201203git963c215e781e
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Thu Dec 03 2020 Frank Ch. Eigler <fche@redhat.com> - 4.4-0.20201203gitf02f08bc6eff
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Thu Nov 12 2020 Frank Ch. Eigler <fche@redhat.com> - 4.4-2
|
||||
- Respin with newer dyninst.
|
||||
|
||||
* Mon Nov 09 2020 Frank Ch. Eigler <fche@redhat.com> - 4.4-1
|
||||
- Upstream release.
|
||||
|
||||
@ -1323,7 +1256,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 passlist.
|
||||
|
||||
* Wed Apr 30 2014 Jonathan Lebon <jlebon@redhat.com> - 2.5-1
|
||||
- Upstream release.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user