From patchwork Mon Jun 17 22:31:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11000631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 103551580 for ; Mon, 17 Jun 2019 22:32:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F340F289C9 for ; Mon, 17 Jun 2019 22:32:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCB76289D3; Mon, 17 Jun 2019 22:32:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EFA3289D3 for ; Mon, 17 Jun 2019 22:32:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726336AbfFQWcY (ORCPT ); Mon, 17 Jun 2019 18:32:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:35840 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726963AbfFQWcX (ORCPT ); Mon, 17 Jun 2019 18:32:23 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C9E4B20833; Mon, 17 Jun 2019 22:32:22 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.92) (envelope-from ) id 1hd0An-00033Z-Tz; Mon, 17 Jun 2019 18:32:21 -0400 Message-Id: <20190617223221.815886530@goodmis.org> User-Agent: quilt/0.65 Date: Mon, 17 Jun 2019 18:31:30 -0400 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Cc: Yordan Karadzhov , Troy Engel Subject: [PATCH 1/2] kernel-shark: Have "make clean" run cmake-clean.sh References: <20190617223129.706595135@goodmis.org> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Steven Rostedt (VMware)" A make clean should clean up the cmake files as well. Update the kernel-shark/README to reflect some of the changes that have been made, and options done by the "make" command line. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 1 + kernel-shark/README | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 693f33b69b4e..c9679d42fdbd 100644 --- a/Makefile +++ b/Makefile @@ -357,6 +357,7 @@ clean: $(MAKE) -C $(src)/python clean $(MAKE) -C $(src)/tracecmd clean if [ -f $(kshark-dir)/build/Makefile ]; then $(MAKE) -C $(kshark-dir)/build clean; fi + cd $(kshark-dir)/build; ./cmake_clean.sh ##### PYTHON STUFF ##### diff --git a/kernel-shark/README b/kernel-shark/README index 75a0dd08dcac..4fb13698261b 100644 --- a/kernel-shark/README +++ b/kernel-shark/README @@ -31,6 +31,11 @@ Building: the original trace-cmd end traceevent libraries. 2. Do: + make gui + +This will perform the following, in case you want to do it directly +yourself: + cd kernel-shark/build cmake ../ make @@ -39,7 +44,11 @@ the original trace-cmd end traceevent libraries. as a CMake Command-Line option. 2.1.2 By default, installation prefix is "/usr/local". It can be changed using --D_INSTALL_PREFIX= as a CMake Command-Line option. +-D_INSTALL_PREFIX= as a CMake Command-Line option. Which can also be +done by passing in "prefix=" to the make command line. + + make prefix=/my/local/dir gui + 2.1.3 In addition to the standard CMake build types (Debug, Release, RelWithDebInfo, MinSizeRel) KernelShark supports a "Package" build type. @@ -57,10 +66,8 @@ Examples: cmake -DCMAKE_BUILD_TYPE=Package -DCMAKE_C_FLAGS_PACKAGE="-O3 -pedantic" ../ -2.2.1 Use "make clean" if you want to delete all already compiled objects. - -2.2.2 Use the script "cmake_clean.sh" if you want to delete all already -compiled objects and all files generated by CMake. +2.2 Use "make clean" if you want to delete all already compiled objects +and all files generated by CMake. 3. After building the code "kernel-shark/lib" will contain all libraries and "kernel-shark/bin" will contain all executables.