Merge branch 'f21' into f20
* f21: (50 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 Handle compressed module filenames (rhbz1150166) ... Conflicts: .gitignore sources systemtap.spec
This commit is contained in:
commit
7394ea81c8
|
@ -98,3 +98,45 @@ systemtap-1.3.tar.gz
|
|||
/systemtap-2.5-0.535.g9d4241d37eb1.tar.gz
|
||||
/systemtap-2.5.tar.gz
|
||||
/systemtap-2.6.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
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
65e6745f0ec103758c711dd1d12fb6bf systemtap-2.6.tar.gz
|
||||
e0c3c36955323ae59be07a26a9563474 systemtap-2.7.tar.gz
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
From 273d6c3a7f76e2c1c3f5634a1c1274323b12745c Mon Sep 17 00:00:00 2001
|
||||
From: Josh Stone <jistone@redhat.com>
|
||||
Date: Tue, 7 Oct 2014 12:38:39 -0700
|
||||
Subject: [PATCH] RHBZ1150166: Handle the filename of compressed modules
|
||||
|
||||
This allows filenames like ".ko.xz" in modname_from_path().
|
||||
---
|
||||
setupdwfl.cxx | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/setupdwfl.cxx b/setupdwfl.cxx
|
||||
index fe44828f8bf1..33239fe67cb9 100644
|
||||
--- a/setupdwfl.cxx
|
||||
+++ b/setupdwfl.cxx
|
||||
@@ -114,11 +114,20 @@ static const string abrt_path =
|
||||
string
|
||||
modname_from_path(const string &path)
|
||||
{
|
||||
- size_t dot = path.rfind('.');
|
||||
size_t slash = path.rfind('/');
|
||||
- if (dot == string::npos || slash == string::npos || dot < slash)
|
||||
+ if (slash == string::npos)
|
||||
return "";
|
||||
- string name = path.substr(slash + 1, dot - slash - 1);
|
||||
+ string name = path.substr(slash + 1);
|
||||
+
|
||||
+ // First look for .ko extension variants like ".ko" or ".ko.xz"
|
||||
+ // If that fails, look for any ".*" extension at all.
|
||||
+ size_t extension = name.rfind(".ko");
|
||||
+ if (extension == string::npos)
|
||||
+ extension = name.rfind('.');
|
||||
+ if (extension == string::npos)
|
||||
+ return "";
|
||||
+
|
||||
+ name.erase(extension);
|
||||
replace_if(name.begin(), name.end(), is_comma_dash, '_');
|
||||
return name;
|
||||
}
|
||||
--
|
||||
1.9.3
|
||||
|
|
@ -67,8 +67,8 @@
|
|||
%define dracutstap %{dracutlibdir}/modules.d/99stap
|
||||
|
||||
Name: systemtap
|
||||
Version: 2.6
|
||||
Release: 2%{?dist}
|
||||
Version: 2.7
|
||||
Release: 1%{?dist}
|
||||
# for version, see also configure.ac
|
||||
|
||||
|
||||
|
@ -103,8 +103,6 @@ License: GPLv2+
|
|||
URL: http://sourceware.org/systemtap/
|
||||
Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
|
||||
|
||||
Patch2: systemtap-2.6-dtrace-flexibility.patch
|
||||
|
||||
# Build*
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: gcc-c++
|
||||
|
@ -392,8 +390,6 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
|
|||
%prep
|
||||
%setup -q %{?setup_elfutils}
|
||||
|
||||
%patch2 -p1
|
||||
|
||||
%if %{with_bundled_elfutils}
|
||||
cd elfutils-%{elfutils_version}
|
||||
%patch1 -p1
|
||||
|
@ -474,7 +470,13 @@ cd ..
|
|||
%global java_config --without-java
|
||||
%endif
|
||||
|
||||
%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{publican_config} %{rpm_config} %{java_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
|
||||
%if %{with_virthost}
|
||||
%global virt_config --enable-virt
|
||||
%else
|
||||
%global virt_config --disable-virt
|
||||
%endif
|
||||
|
||||
%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{publican_config} %{rpm_config} %{java_config} %{virt_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%if %{with_emacsvim}
|
||||
|
@ -1034,26 +1036,23 @@ done
|
|||
# http://sourceware.org/systemtap/wiki/SystemTapReleases
|
||||
|
||||
%changelog
|
||||
* Thu Sep 25 2014 Josh Stone <jistone@redhat.com> - 2.6-2
|
||||
- Backport patches to improve dtrace's input flexibility
|
||||
- Let dtrace use its old method if pyparsing fails (rhbz1131586)
|
||||
- Allow dtrace -fPIC (rhbz1145993)
|
||||
* Wed Feb 18 2015 Frank Ch. Eigler <fche@redhat.com> - 2.7-1
|
||||
- Upstream release.
|
||||
|
||||
* Fri Sep 05 2014 Josh Stone <jistone@redhat.com> - 2.6-1
|
||||
- Upstream release.
|
||||
|
||||
* Wed Aug 20 2014 Josh Stone <jistone@redhat.com> - 2.5-3
|
||||
- Rebuilt for dyninst-8.2.0
|
||||
|
||||
* Fri May 02 2014 Frank Ch. Eigler <fche@redhat.com> - 2.5-2
|
||||
- Include fix for upstream http://sourceware.org/PR16894
|
||||
* Mon Jul 07 2014 Josh Stone <jistone@redhat.com>
|
||||
- Flip with_dyninst to an %ifarch whitelist.
|
||||
|
||||
* Wed Apr 30 2014 Jonathan Lebon <jlebon@redhat.com> - 2.5-1
|
||||
- Upstream release. See wiki page below for detailed notes.
|
||||
http://sourceware.org/systemtap/wiki/SystemTapReleases
|
||||
- Upstream release.
|
||||
|
||||
* Wed Feb 19 2014 Frank Ch. Eigler <fche@redhat.com> - 2.4-2
|
||||
- Backport fix for BZ1043212: use of systemd-tmpfiles --create without PATH
|
||||
* Thu Feb 13 2014 Lukas Berk <lberk@redhat.com>
|
||||
- Add directory checks for runtime-java sym links
|
||||
|
||||
* Mon Jan 06 2014 Jonathan Lebon <jlebon@redhat.com>
|
||||
- Added dracut module to initscript package
|
||||
|
||||
* Wed Nov 06 2013 Frank Ch. Eigler <fche@redhat.com> - 2.4-1
|
||||
- Upstream release.
|
||||
|
|
Loading…
Reference in New Issue