From e870e8a6e129eab57584197bb6928382e871fc0f Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 10 Oct 2010 15:08:13 +0000
Subject: [PATCH] perf: Fix paths in Python report script wrappers

svn path=/dists/trunk/linux-2.6/; revision=16423
---
 ...F_EXEC_PATH-in-canned-report-scripts.patch | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/patches/bugfix/all/perf-Use-PERF_EXEC_PATH-in-canned-report-scripts.patch b/debian/patches/bugfix/all/perf-Use-PERF_EXEC_PATH-in-canned-report-scripts.patch
index 0f21beb97..0e9b7f70a 100644
--- a/debian/patches/bugfix/all/perf-Use-PERF_EXEC_PATH-in-canned-report-scripts.patch
+++ b/debian/patches/bugfix/all/perf-Use-PERF_EXEC_PATH-in-canned-report-scripts.patch
@@ -1,4 +1,3 @@
-From d8eea3fc6c77e5de595efeda8b8747c8588e4df8 Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben@decadent.org.uk>
 Date: Sun, 10 Oct 2010 02:20:51 +0100
 Subject: [PATCH] perf: Use $PERF_EXEC_PATH in canned report scripts
@@ -119,7 +118,7 @@ index 3508113..df0c65f 100644
  
  
 diff --git a/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report b/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
-index 3029354..af97430 100644
+index 3029354..0358702 100644
 --- a/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
 +++ b/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
 @@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
@@ -127,18 +126,18 @@ index 3029354..af97430 100644
      fi
  fi
 -perf trace $@ -s ~/libexec/perf-core/scripts/python/failed-syscalls-by-pid.py $comm
-+perf trace $@ -s "$PERF_EXEC_PATH"/perf-core/scripts/python/failed-syscalls-by-pid.py $comm
++perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/netdev-times.py $comm
 diff --git a/tools/perf/scripts/python/bin/sched-migration-report b/tools/perf/scripts/python/bin/sched-migration-report
-index 61d05f7..d1e8e24 100644
+index 61d05f7..df1791f 100644
 --- a/tools/perf/scripts/python/bin/sched-migration-report
 +++ b/tools/perf/scripts/python/bin/sched-migration-report
 @@ -1,3 +1,3 @@
  #!/bin/bash
  # description: sched migration overview
 -perf trace $@ -s ~/libexec/perf-core/scripts/python/sched-migration.py
-+perf trace $@ -s "$PERF_EXEC_PATH"/perf-core/scripts/python/sched-migration.py
++perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/sched-migration.py
 diff --git a/tools/perf/scripts/python/bin/sctop-report b/tools/perf/scripts/python/bin/sctop-report
-index b01c842..ad8c881 100644
+index b01c842..36b409c 100644
 --- a/tools/perf/scripts/python/bin/sctop-report
 +++ b/tools/perf/scripts/python/bin/sctop-report
 @@ -21,4 +21,4 @@ elif [ "$n_args" -gt 0 ] ; then
@@ -146,9 +145,9 @@ index b01c842..ad8c881 100644
      shift
  fi
 -perf trace $@ -s ~/libexec/perf-core/scripts/python/sctop.py $comm $interval
-+perf trace $@ -s "$PERF_EXEC_PATH"/perf-core/scripts/python/sctop.py $comm $interval
++perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/sctop.py $comm $interval
 diff --git a/tools/perf/scripts/python/bin/syscall-counts-by-pid-report b/tools/perf/scripts/python/bin/syscall-counts-by-pid-report
-index 9e9d8dd..496d205 100644
+index 9e9d8dd..4eb88c9 100644
 --- a/tools/perf/scripts/python/bin/syscall-counts-by-pid-report
 +++ b/tools/perf/scripts/python/bin/syscall-counts-by-pid-report
 @@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
@@ -156,9 +155,9 @@ index 9e9d8dd..496d205 100644
      fi
  fi
 -perf trace $@ -s ~/libexec/perf-core/scripts/python/syscall-counts-by-pid.py $comm
-+perf trace $@ -s "$PERF_EXEC_PATH"/perf-core/scripts/python/syscall-counts-by-pid.py $comm
++perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/syscall-counts-by-pid.py $comm
 diff --git a/tools/perf/scripts/python/bin/syscall-counts-report b/tools/perf/scripts/python/bin/syscall-counts-report
-index dc076b6..c981f7a 100644
+index dc076b6..cb2f9c5 100644
 --- a/tools/perf/scripts/python/bin/syscall-counts-report
 +++ b/tools/perf/scripts/python/bin/syscall-counts-report
 @@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
@@ -166,7 +165,7 @@ index dc076b6..c981f7a 100644
      fi
  fi
 -perf trace $@ -s ~/libexec/perf-core/scripts/python/syscall-counts.py $comm
-+perf trace $@ -s "$PERF_EXEC_PATH"/perf-core/scripts/python/syscall-counts.py $comm
++perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/syscall-counts.py $comm
 -- 
 1.7.1