[linux] 02/02: Revert "enable `perf data' support"

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch jessie-backports
in repository linux.

commit 53ba16dafcce887c3be444e4ee0a684f670c9648
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jan 24 18:17:38 2017 +0000

    Revert "enable `perf data' support"
    
    This reverts commit b9aaa1abc564d588d705f879cd5f990a783e0aef.
    libbabeltrace is not available in jessie{,-backports}.
---
 debian/changelog                   | 1 +
 debian/rules.d/tools/perf/Makefile | 3 ---
 debian/templates/control.source.in | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d1cd04..de5c89f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ linux (4.9.2-2~bpo8+1) UNRELEASED; urgency=medium
     - Revert changes to flex and asciidoc build-depdencies
     - linux-image-dbg: Revert changes to packaging of debug symbols, as new-
       style dbgsym packages are not properly supported in jessie-backports
+    - Revert "enable `perf data' support" as libbabeltrace is not available
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 24 Jan 2017 18:14:08 +0000
 
diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile
index ec0c9e9..aa50e42 100644
--- a/debian/rules.d/tools/perf/Makefile
+++ b/debian/rules.d/tools/perf/Makefile
@@ -48,9 +48,6 @@ 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 40ced46..1190a63 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -33,8 +33,6 @@ Build-Depends:
  flex <!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