mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-02 10:52:57 +02:00
systemtap: update to 2.7.
This commit is contained in:
parent
66746bccde
commit
126d7ac213
2 changed files with 3 additions and 42 deletions
|
@ -1,39 +0,0 @@
|
||||||
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(-)
|
|
||||||
|
|
||||||
--- setupdwfl.cxx
|
|
||||||
+++ 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
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'systemtap'
|
# Template file for 'systemtap'
|
||||||
pkgname=systemtap
|
pkgname=systemtap
|
||||||
version=2.6
|
version=2.7
|
||||||
revision=2
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
makedepends="elfutils-devel"
|
makedepends="elfutils-devel"
|
||||||
short_desc="Infrastructure to simplify the gathering of information"
|
short_desc="Infrastructure to simplify the gathering of information"
|
||||||
|
@ -9,4 +9,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
license="GPL-3"
|
license="GPL-3"
|
||||||
homepage="https://sourceware.org/systemtap/"
|
homepage="https://sourceware.org/systemtap/"
|
||||||
distfiles="https://sourceware.org/systemtap/ftp/releases/systemtap-${version}.tar.gz"
|
distfiles="https://sourceware.org/systemtap/ftp/releases/systemtap-${version}.tar.gz"
|
||||||
checksum=9ff5d27602f65b8ad3b8165e48cc562638e5d7f22ff0238618dfb3be168ef151
|
checksum=304626be121ad5097ee0816a4f74f100b06d9d0b9f2987b98e4966b7dcf8d4df
|
||||||
|
|
Loading…
Add table
Reference in a new issue