From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755433AbbBFOf0 (ORCPT ); Fri, 6 Feb 2015 09:35:26 -0500 Received: from smtprelay0061.hostedemail.com ([216.40.44.61]:51586 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752189AbbBFOfY convert rfc822-to-8bit (ORCPT ); Fri, 6 Feb 2015 09:35:24 -0500 X-Session-Marker: 6E657665747340676F6F646D69732E6F7267 X-Spam-Summary: 50,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::,RULES_HIT:41:355:379:541:599:800:960:967:973:988:989:1260:1277:1311:1313:1314:1345:1359:1434:1437:1513:1515:1516:1518:1521:1534:1542:1593:1594:1711:1730:1747:1777:1792:2198:2199:2393:2525:2553:2560:2563:2682:2685:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3353:3622:3865:3866:3867:3868:3872:3873:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:5007:6119:6120:6261:7514:7774:7875:9025:9545:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12438:12517:12519:12555:12740:13221:13229:13848:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: deer47_2ef8f3a46d23c X-Filterd-Recvd-Size: 3302 Date: Fri, 6 Feb 2015 09:35:21 -0500 From: Steven Rostedt To: LKML , Cc: John Kacur , Christian Neukirchen , Troy Engel Subject: Re: [ANNOUNCE] trace-cmd 2.5.2 (and others) Message-ID: <20150206093521.26348f7a@gandalf.local.home> In-Reply-To: <20150205173237.673691d0@gandalf.local.home> References: <20150205173237.673691d0@gandalf.local.home> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 5 Feb 2015 17:32:37 -0500 Steven Rostedt 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 Reported-by: Troy Engel Signed-off-by: Steven Rostedt --- 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