debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

perf: Enable Perl and Python scripting 

svn path=/dists/trunk/linux-2.6/; revision=16422
This commit is contained in:
Ben Hutchings 2010-10-10 02:36:46 +00:00
parent c86844648a
commit e54cefd0de
6 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -7,7 +7,8 @@ linux-2.6 (2.6.36~rc7-1~experimental.1) UNRELEASED; urgency=low
* [x86] Staging: fix Makefile so brcm80211 will actually build
(Closes: #599465)
* [x86] Enable modular IDEAPAD_ACPI (Closes: #599444)
* perf: Move scripts to /usr/share/perf_<version>-core (Closes: #599624)
* perf: Enable Perl and Python scripting
- Move scripts to /usr/share/perf_<version>-core (Closes: #599624)
-- Ben Hutchings <ben@decadent.org.uk> Thu, 07 Oct 2010 03:24:21 +0100

28
debian/patches/bugfix/all/perf-Fix-detection-of-script-extension.patch vendored Normal file
View File

@ -0,0 +1,28 @@
From cf22a40e611cd1aeda44bca29d86e5d34ff90dc5 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 10 Oct 2010 03:31:00 +0100
Subject: [PATCH] perf: Fix detection of script extension
The extension starts with the last dot in the name, not the first.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
tools/perf/builtin-trace.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 3ea6219..deda1a9 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -282,7 +282,7 @@ static int parse_scriptname(const struct option *opt __used,
script++;
} else {
script = str;
- ext = strchr(script, '.');
+ ext = strrchr(script, '.');
if (!ext) {
fprintf(stderr, "invalid script extension");
return -1;
--
1.7.1

1
debian/patches/series/base vendored
View File

@ -48,3 +48,4 @@
+ bugfix/all/vivi-Don-t-depend-on-FONTS.patch
+ bugfix/all/qla4xxx-Fix-build-on-some-architectures-lacking-64-bit-I-O.patch
+ bugfix/all/perf-Use-PERF_EXEC_PATH-in-canned-report-scripts.patch
+ bugfix/all/perf-Fix-detection-of-script-extension.patch

2
debian/rules.real vendored
View File

@ -503,6 +503,8 @@ install-tools_$(ARCH): $(STAMPS_DIR)/build-tools_$(ARCH)
# Fix up cross-references
sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(VERSION)-/g }' \
$(PACKAGE_DIR)/usr/share/man/*/*
dh_perl /usr/share/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/
dh_pysupport /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/
+$(MAKE_SELF) install-base
install-patch: PACKAGE = linux-patch-debian-$(VERSION)

2
debian/templates/control.main.in vendored
View File

@ -1,6 +1,6 @@
Package: linux-tools-@version@
Architecture: alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64
Depends: ${shlibs:Depends}, ${misc:Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
Recommends: linux-base (>= 2.6.32-16)
Suggests: linux-doc-@version@
Description: Performance analysis tools for Linux @upstreamversion@

4
debian/templates/control.source.in vendored
View File

@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>
Standards-Version: 3.8.4
Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, binutils-dev, asciidoc, xmlto
Build-Depends-Indep: bzip2, python-support
Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, binutils-dev, asciidoc, xmlto, libperl-dev, python-dev, python-support
Build-Depends-Indep: bzip2
Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-2.6/
Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-2.6/?op=log