On Thu, 5 Feb 2015 17:32:37 -0500 Steven Rostedt <rostedt@xxxxxxxxxxx> wrote: > > You can get trace-cmd from: > > https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/ > > > Tag: trace-cmd-v2.5.2 > It has been reported to me that version 2.5.2 broke the build of kernelshark. I just fixed that and pushed to master, and the trace-cmd-stable-v2.5 branch. I added the tag trace-cmd-v2.5.2-1 that holds the change. I did not make a 2.5.3 because no functionality change or fixes have been done to trace-cmd itself. Only a fix for kernelshark was made. -- Steve >From cd0d29f41041d627fcc0d0446bfca697c20ee3c3 Mon Sep 17 00:00:00 2001 Subject: [PATCH] trace-cmd build: Add trace-hooks.o to library files kernelshark links against libtracecmd.a. The hook functions are now part of that, but trace-hooks.o was only linked to the trace-cmd object itself and not the library. This broke the build of kernelshark. Reported-by: Christian Neukirchen <chneukirchen@xxxxxxxxx> Reported-by: Troy Engel <troyengel@xxxxxxxxx> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1e9dc44e6011..55930eeaae12 100644 --- a/Makefile +++ b/Makefile @@ -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-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_VIEW_OBJS = trace-view.o trace-view-store.o TRACE_GRAPH_OBJS = trace-graph.o trace-plot.o trace-plot-cpu.o trace-plot-task.o TRACE_VIEW_MAIN_OBJS = trace-view-main.o $(TRACE_VIEW_OBJS) $(TRACE_GUI_OBJS) @@ -320,7 +320,7 @@ PEVENT_LIB_OBJS = event-parse.o trace-seq.o parse-filter.o parse-utils.o 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 -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-trace-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|