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 - 4.5-0.202102191905git0f623095ee3e +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Wed Feb 10 2021 Frank Ch. Eigler - 4.5-0.202102101544git8d5e0abc542c - Automated weekly rawhide release - Applied spec changes from upstream git