Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
564fc82956
|
@ -1,4 +1,3 @@
|
|||
*~
|
||||
/systemtap-3.1.tar.gz
|
||||
/systemtap-3.2-0.20170321git272146660f54.tar.gz
|
||||
/systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz
|
||||
|
@ -35,3 +34,8 @@
|
|||
/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
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (systemtap-4.2-0.20190807gitebfc300ec2ad.tar.gz) = 378d8ba68809318c0a962dbbc2f98034f2396b87dd8bef4e5d81e98cba1aa8dc53e7b56ec2e8cc9a87a14c0d16b2921aaca6dfd63fc871fee3bab070015d3482
|
||||
SHA512 (systemtap-4.3-0.20200211git91ffb97ad335.tar.gz) = 449959f46a89633f57c20cbeb0ded7031587e6df7cf19c30a237bb1886a7235e066c2878023385a7ec83e6045ab31bc8819991574a5840c8080d2ea066974eb5
|
||||
|
|
|
@ -10,11 +10,10 @@
|
|||
%{!?with_crash: %global with_crash 1}
|
||||
%endif
|
||||
%{!?with_rpm: %global with_rpm 1}
|
||||
%{!?with_bundled_elfutils: %global with_bundled_elfutils 0}
|
||||
%{!?elfutils_version: %global elfutils_version 0.142}
|
||||
%{!?pie_supported: %global pie_supported 1}
|
||||
%{!?with_boost: %global with_boost 0}
|
||||
%ifarch %{ix86} x86_64 ppc ppc64
|
||||
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64
|
||||
%{!?with_dyninst: %global with_dyninst 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
|
||||
%else
|
||||
%{!?with_dyninst: %global with_dyninst 0}
|
||||
|
@ -87,8 +86,8 @@
|
|||
%define __brp_mangle_shebangs_exclude_from .stp$
|
||||
|
||||
Name: systemtap
|
||||
Version: 4.2
|
||||
Release: 0.20190808gitebfc300ec2ad.0.riscv64%{?dist}
|
||||
Version: 4.3
|
||||
Release: 0.20200212git91ffb97ad335.0.riscv64%{?dist}
|
||||
# for version, see also configure.ac
|
||||
|
||||
|
||||
|
@ -122,7 +121,7 @@ Release: 0.20190808gitebfc300ec2ad.0.riscv64%{?dist}
|
|||
Summary: Programmable system-wide instrumentation system
|
||||
License: GPLv2+
|
||||
URL: http://sourceware.org/systemtap/
|
||||
Source: %{name}-%{version}-0.20190807gitebfc300ec2ad.tar.gz
|
||||
Source: %{name}-%{version}-0.20200211git91ffb97ad335.tar.gz
|
||||
|
||||
# Build*
|
||||
BuildRequires: gcc-c++
|
||||
|
@ -131,7 +130,7 @@ BuildRequires: gettext-devel
|
|||
BuildRequires: pkgconfig(nss)
|
||||
BuildRequires: pkgconfig(avahi-client)
|
||||
%if %{with_dyninst}
|
||||
BuildRequires: dyninst-devel >= 8.0
|
||||
BuildRequires: dyninst-devel >= 10.0
|
||||
BuildRequires: pkgconfig(libselinux)
|
||||
%endif
|
||||
%if %{with_sqlite}
|
||||
|
@ -154,14 +153,7 @@ BuildRequires: crash-devel zlib-devel
|
|||
%if %{with_rpm}
|
||||
BuildRequires: rpm-devel
|
||||
%endif
|
||||
%if %{with_bundled_elfutils}
|
||||
Source1: elfutils-%{elfutils_version}.tar.gz
|
||||
Patch1: elfutils-portability.patch
|
||||
BuildRequires: m4
|
||||
%global setup_elfutils -a1
|
||||
%else
|
||||
BuildRequires: elfutils-devel >= %{elfutils_version}
|
||||
%endif
|
||||
%if %{with_docs}
|
||||
BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||
|
@ -514,35 +506,10 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
|
|||
# ------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q %{?setup_elfutils}
|
||||
|
||||
%if %{with_bundled_elfutils}
|
||||
cd elfutils-%{elfutils_version}
|
||||
%patch1 -p1
|
||||
sleep 1
|
||||
find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch
|
||||
sleep 1
|
||||
find . \( -name configure -o -name config.h.in \) -print | xargs touch
|
||||
cd ..
|
||||
%endif
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
|
||||
%if %{with_bundled_elfutils}
|
||||
# Build our own copy of elfutils.
|
||||
%global elfutils_config --with-elfutils=elfutils-%{elfutils_version}
|
||||
|
||||
# We have to prevent the standard dependency generation from identifying
|
||||
# our private elfutils libraries in our provides and requires.
|
||||
%global _use_internal_dependency_generator 0
|
||||
%global filter_eulibs() /bin/sh -c "%{1} | sed '/libelf/d;/libdw/d;/libebl/d'"
|
||||
%global __find_provides %{filter_eulibs /usr/lib/rpm/find-provides}
|
||||
%global __find_requires %{filter_eulibs /usr/lib/rpm/find-requires}
|
||||
|
||||
# This will be needed for running stap when not installed, for the test suite.
|
||||
%global elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils
|
||||
%endif
|
||||
|
||||
# Enable/disable the dyninst pure-userspace backend
|
||||
%if %{with_dyninst}
|
||||
%global dyninst_config --with-dyninst
|
||||
|
@ -638,12 +605,9 @@ cd ..
|
|||
# We don't ship compileworthy python code, just oddball samples
|
||||
%global py_auto_byte_compile 0
|
||||
|
||||
%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
|
||||
%configure %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%if %{with_emacsvim}
|
||||
%{_emacs_bytecompile} emacs/systemtap-mode.el
|
||||
%endif
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
|
@ -1090,10 +1054,6 @@ done
|
|||
%dir %{_libexecdir}/systemtap
|
||||
%{_libexecdir}/systemtap/libHelperSDT_*.so
|
||||
%endif
|
||||
%if %{with_bundled_elfutils}
|
||||
%dir %{_libdir}/systemtap
|
||||
%{_libdir}/systemtap/lib*.so*
|
||||
%endif
|
||||
%if %{with_emacsvim}
|
||||
%{_emacs_sitelispdir}/*.el*
|
||||
%{_emacs_sitestartdir}/systemtap-init.el
|
||||
|
@ -1266,39 +1226,29 @@ done
|
|||
|
||||
# PRERELEASE
|
||||
%changelog
|
||||
* Wed Aug 21 2019 David Abdurachmanov <david.abdurachmanov@sifive.om> - 4.2-0.20190808gitebfc300ec2ad.0.riscv64
|
||||
* Sat Apr 25 2020 David Abdurachmanov <david.abdurachmanov@sifive.om> - 4.3-0.20200212git91ffb97ad335.0.riscv64
|
||||
- Add support for RISC-V (riscv64)
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.2-0.20190808gitebfc300ec2ad
|
||||
- Rebuilt for Python 3.8
|
||||
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 4.3-0.20200212git91ffb97ad335
|
||||
- Rebuild (json-c)
|
||||
|
||||
* Wed Aug 07 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-0.20190807gitebfc300ec2ad
|
||||
* Tue Feb 11 2020 Frank Ch. Eigler <fche@redhat.com> - 4.3-0.20200211git91ffb97ad335
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-0.20190619git47c3f6c60174
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Jun 18 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-0.20190618git47c3f6c60174
|
||||
* Mon Feb 03 2020 Frank Ch. Eigler <fche@redhat.com> - 4.3-0.20200203git6c0b74f5910a
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Thu Jun 13 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-0.20190613git2d77f531a5d1
|
||||
* 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 Jun 10 22:13:24 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2-0.20190606git8b868f3dd030
|
||||
- Rebuild for RPM 4.15
|
||||
|
||||
* Mon Jun 10 15:42:06 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2-0.20190605git8b868f3dd030
|
||||
- Rebuild for RPM 4.15
|
||||
|
||||
* Tue Jun 04 2019 Stan Cox <scox@redhat.com> - 4.2-0.20190604git8b868f3dd030
|
||||
- Rebuild for dyninst 10.1.0
|
||||
|
||||
* Mon May 13 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-0.20190513git8b868f3dd030
|
||||
- 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.
|
||||
|
|
Loading…
Reference in New Issue