replace with upstream patch https://lkml.org/lkml/2015/2/6/369
This commit is contained in:
parent
5f5480b013
commit
7ec185e98e
2 changed files with 24 additions and 15 deletions
|
|
@ -1,14 +1,20 @@
|
||||||
--- Makefile.orig 2015-02-05 08:53:22.000000000 -0600
|
--- a/Makefile
|
||||||
+++ Makefile 2015-02-06 08:04:14.357939500 -0600
|
+++ b/Makefile
|
||||||
@@ -309,8 +309,9 @@
|
@@ -308,7 +308,7 @@ TRACE_GUI_OBJS = trace-filter.o trace-compat.o trace-filter-hash.o trace-dialog.
|
||||||
|
trace-xml.o
|
||||||
TRACE_CMD_OBJS = trace-cmd.o trace-record.o trace-read.o trace-split.o trace-listen.o \
|
TRACE_CMD_OBJS = trace-cmd.o trace-record.o trace-read.o trace-split.o trace-listen.o \
|
||||||
trace-stack.o trace-hist.o trace-mem.o trace-snapshot.o trace-stat.o \
|
trace-stack.o trace-hist.o trace-mem.o trace-snapshot.o trace-stat.o \
|
||||||
trace-hash.o trace-profile.o trace-stream.o trace-hooks.o
|
- trace-hash.o trace-profile.o trace-stream.o trace-hooks.o
|
||||||
-TRACE_VIEW_OBJS = trace-view.o trace-view-store.o
|
+ trace-hash.o trace-profile.o trace-stream.o
|
||||||
-TRACE_GRAPH_OBJS = trace-graph.o trace-plot.o trace-plot-cpu.o trace-plot-task.o
|
TRACE_VIEW_OBJS = trace-view.o trace-view-store.o
|
||||||
+TRACE_VIEW_OBJS = trace-view.o trace-view-store.o trace-hooks.o
|
TRACE_GRAPH_OBJS = trace-graph.o trace-plot.o trace-plot-cpu.o trace-plot-task.o
|
||||||
+TRACE_GRAPH_OBJS = trace-graph.o trace-plot.o trace-plot-cpu.o \
|
|
||||||
+ trace-plot-task.o trace-hooks.o
|
|
||||||
TRACE_VIEW_MAIN_OBJS = trace-view-main.o $(TRACE_VIEW_OBJS) $(TRACE_GUI_OBJS)
|
TRACE_VIEW_MAIN_OBJS = trace-view-main.o $(TRACE_VIEW_OBJS) $(TRACE_GUI_OBJS)
|
||||||
TRACE_GRAPH_MAIN_OBJS = trace-graph-main.o $(TRACE_GRAPH_OBJS) $(TRACE_GUI_OBJS)
|
@@ -320,7 +320,7 @@ PEVENT_LIB_OBJS = event-parse.o trace-seq.o parse-filter.o parse-utils.o
|
||||||
KERNEL_SHARK_OBJS = $(TRACE_VIEW_OBJS) $(TRACE_GRAPH_OBJS) $(TRACE_GUI_OBJS) \
|
TCMD_LIB_OBJS = $(PEVENT_LIB_OBJS) trace-util.o trace-input.o trace-ftrace.o \
|
||||||
|
trace-output.o trace-record.o trace-recorder.o \
|
||||||
|
trace-restore.o trace-usage.o trace-blk-hack.o \
|
||||||
|
- kbuffer-parse.o event-plugin.o
|
||||||
|
+ kbuffer-parse.o event-plugin.o trace-hooks.o
|
||||||
|
|
||||||
|
PLUGIN_OBJS =
|
||||||
|
PLUGIN_OBJS += plugin_jbd2.o
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Current Maintainer: Troy Engel <troyengel+arch@gmail.com>
|
# Current Maintainer: Troy Engel <troyengel+arch@gmail.com>
|
||||||
|
|
||||||
pkgname=trace-cmd
|
pkgname=trace-cmd
|
||||||
pkgver=2.5.1
|
pkgver=2.5.2
|
||||||
pkgrel=3
|
pkgrel=2
|
||||||
pkgdesc="user-space front-end command-line tool for Ftrace, inclduing the GUI interface application kernelshark as well as trace-graph and trace-view."
|
pkgdesc="user-space front-end command-line tool for Ftrace, inclduing the GUI interface application kernelshark as well as trace-graph and trace-view."
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git"
|
url="http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git"
|
||||||
|
|
@ -11,12 +11,15 @@ depends=('python2' 'gtk2')
|
||||||
makedepends=('pygtk' 'swig' 'docbook-xsl' 'asciidoc')
|
makedepends=('pygtk' 'swig' 'docbook-xsl' 'asciidoc')
|
||||||
provides=('trace-cmd')
|
provides=('trace-cmd')
|
||||||
conflicts=('trace-cmd-git')
|
conflicts=('trace-cmd-git')
|
||||||
source=("http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/snapshot/trace-cmd-v${pkgver}.tar.gz")
|
source=("http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/snapshot/trace-cmd-v${pkgver}.tar.gz"
|
||||||
sha256sums=("2cfb4470d20c05bc58431294464da3b7a88d3011f35a847dd25c40052eb2893a")
|
"Makefile-2.5.2-hooks.patch")
|
||||||
|
sha256sums=('24eedc143bb9716fecac9479d7a2559cc6a35856901b73f94bd7ec3b49a03533'
|
||||||
|
'6bbfecf43d9464abc3f3976959f28924f11aca2d51855597b4c881e2f5744402')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}/${pkgname}-v${pkgver}"
|
cd "${srcdir}/${pkgname}-v${pkgver}"
|
||||||
|
|
||||||
|
patch -p1 < "${srcdir}/Makefile-2.5.2-hooks.patch"
|
||||||
make PYTHON_VERS=python2 all gui doc
|
make PYTHON_VERS=python2 all gui doc
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Reference in a new issue