[linux] 01/01: enable `perf data' support

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

ukleinek pushed a commit to branch master
in repository linux.

commit b9aaa1abc564d588d705f879cd5f990a783e0aef
Author: Uwe Kleine-König <ukleinek at debian.org>
Date:   Wed Dec 21 09:53:24 2016 +0100

    enable `perf data' support
---
 debian/changelog                   | 4 ++++
 debian/rules.d/tools/perf/Makefile | 3 +++
 debian/templates/control.source.in | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 783337b..2ac464f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ linux (4.9-1~exp1) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * Set ABI to trunk
 
+  [ Uwe Kleine-König ]
+  * enable `perf data' support; patch by Sebastian Andrzej Siewior
+    (Closes: #846597)
+
  -- Uwe Kleine-Koenig <ukleinek at debian.org>  Sun, 18 Dec 2016 17:53:39 +0100
 
 linux (4.9~rc8-1~exp1) experimental; urgency=medium
diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile
index aa50e42..ec0c9e9 100644
--- a/debian/rules.d/tools/perf/Makefile
+++ b/debian/rules.d/tools/perf/Makefile
@@ -48,6 +48,9 @@ MAKE_PERF += feature-libbfd=0 HAVE_CPLUS_DEMANGLE_SUPPORT=1
 # an explicit exception.  Override detection of libcrypto.
 MAKE_PERF += NO_LIBCRYPTO=1
 
+# Currently babeltrace support for `perf data' is not automatically detected.
+MAKE_PERF += LIBBABELTRACE=1
+
 all:
 ifdef KERNEL_ARCH_PERF
 # perf changes some default directories depending on whether DESTDIR is
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 41956e0..34fc2dc 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -34,6 +34,8 @@ Build-Depends:
  flex (>= 2.6.1-1.1~) <!stage1 !pkg.linux.notools !nopython> | flex:native <!stage1 !pkg.linux.notools !nopython>,
  gcc-multilib [amd64 ppc64 s390x sparc64] <!stage1 !pkg.linux.notools !nopython>,
  libaudit-dev <!stage1 !pkg.linux.notools !nopython>,
+ libbabeltrace-dev (>= 1.5.0) <!stage1 !pkg.linux.notools !nopython>,
+ libbabeltrace-ctf-dev (>= 1.5.0) <!stage1 !pkg.linux.notools !nopython>,
  libdw-dev <!stage1 !pkg.linux.notools !nopython>,
  libelf-dev <!stage1 !pkg.linux.notools !nopython>,
  libiberty-dev <!stage1 !pkg.linux.notools !nopython>,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git