From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6077C352AA for ; Wed, 2 Oct 2019 11:42:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B6AB21920 for ; Wed, 2 Oct 2019 11:42:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rd20WqDM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727223AbfJBLmC (ORCPT ); Wed, 2 Oct 2019 07:42:02 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:33973 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726721AbfJBLmC (ORCPT ); Wed, 2 Oct 2019 07:42:02 -0400 Received: by mail-wr1-f67.google.com with SMTP id a11so19301223wrx.1 for ; Wed, 02 Oct 2019 04:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yjO1GI9WSTyl7GI7EAfh6xqtE/wh9IHfL7MdVWHzIWs=; b=Rd20WqDMTtz1w4UismWXpCQ/BztUgNqY/h4VPHgv9nyidV6vaKH/doRAjcmkLMCBFP PGiqW5vpWeU3pLTTN9upJlxUpinXpNvR9RiI+aN6YLq6dRSi/1gUsIHvt94myotg8E87 Olnl9BGaLRxNxI/n+MBQilQjJbltZJSYYdvQQlm5esBvbZXOgTATG2b4J1EtKaEifwer Fo/WoO8Ck72vyUKuHea1A+u/YipMwWFuxgREmAqduXaMP9WEiXSAV6uX8C/btzOA5Ygw ErUzTgx1m37+sfrrfR/0wIF7HiKbMJmNho04iUUoJWoHNsG4C5C+RyY1a7z9eU4XCmMf POig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yjO1GI9WSTyl7GI7EAfh6xqtE/wh9IHfL7MdVWHzIWs=; b=EdyclNumTUNH26PUL5OYwLyUcSsy54TFq1FCJw+3O5hq1Am2bEFDjWXVJpO26spyKo p64Wx9pX1r9RMLswyn0v+HQY21zyzQOzWnQe1TdRMRwXPzJoXHmK9ColdnimtSIhb58V DGKWQTI+oNQ08DNQy7CkyH+KStAP708vtVx6u+4YT1FJlC5nlkqRYmdyDtkdmNDPr3sT igcFiyck+GNdi0MJWupYhZz+3BHEn4Ao7XhU8FJ3AAt+5s2Jvo8WJa06elRVnp4sFtj7 NMIOmObPUd42KhNjdqa/+U27dLye0QWCETvAxu9FlXOfrG/sipq9zq1N2q739b9csjKx vmlA== X-Gm-Message-State: APjAAAVr1R6kPZSaCMpVZB8MSYFIrHHQnX1rscqHzVD4R2AChOdF9oCM C+Wfj6jyhVmwHTxX62ud53zTR7ss X-Google-Smtp-Source: APXvYqzzJZBUZ7v1LUQa9xoDPfV7lj/BSTIdhGF3LKdjkfavHKcOtLjPYDjVINhJtKaifk5TNn/ChA== X-Received: by 2002:a5d:490f:: with SMTP id x15mr2238706wrq.375.1570016519252; Wed, 02 Oct 2019 04:41:59 -0700 (PDT) Received: from oberon.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id l4sm3004658wrw.6.2019.10.02.04.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2019 04:41:58 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v3 4/5] trace-cmd: Change plugin install directories Date: Wed, 2 Oct 2019 14:41:51 +0300 Message-Id: <20191002114152.30048-5-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191002114152.30048-1-tz.stoyanov@gmail.com> References: <20191002114152.30048-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: Tzvetomir Stoyanov To be compliant with XDG user directory layout, the user's plugin directory is changed from ~/.traceevent/plugins to ~/.local/lib/traceevent/plugins/ Thanks to Patrick McLean: https://lore.kernel.org/linux-trace-devel/20190313144206.41e75cf8@patrickm/ The system plugin directory is changed from (install_prefix)/lib/trace-cmd/plugins to (install_prefix)/lib/traceevent/plugins This change paves the way for implementing trace-cmd specific plugins. Suggested-by: Patrick McLean Signed-off-by: Tzvetomir Stoyanov (VMware) --- Makefile | 16 ++++++++-------- lib/traceevent/event-plugin.c | 6 +++--- lib/traceevent/plugins/Makefile | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index e20eced..cb5b07b 100644 --- a/Makefile +++ b/Makefile @@ -56,15 +56,15 @@ export img_install img_install_SQ export DESTDIR DESTDIR_SQ ifeq ($(prefix),$(HOME)) -plugin_dir = $(HOME)/.trace-cmd/plugins +plugin_traceevent_dir = $(HOME)/.local/lib/traceevent/plugins python_dir = $(HOME)/.trace-cmd/python var_dir = $(HOME)/.trace-cmd/ else -plugin_dir = $(libdir)/trace-cmd/plugins +plugin_traceevent_dir = $(libdir)/traceevent/plugins python_dir ?= $(libdir)/trace-cmd/python -PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)" +PLUGIN_DIR_TRACEEVENT = -DPLUGIN_TRACEEVENT_DIR="$(plugin_traceevent_dir)" PYTHON_DIR = -DPYTHON_DIR="$(python_dir)" -PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' +PLUGIN_DIR_TRACEEVENT_SQ = '$(subst ','\'',$(PLUGIN_DIR_TRACEEVENT))' PYTHON_DIR_SQ = '$(subst ','\'',$(PYTHON_DIR))' var_dir = /var endif @@ -72,7 +72,7 @@ endif # Shell quotes bindir_SQ = $(subst ','\'',$(bindir)) bindir_relative_SQ = $(subst ','\'',$(bindir_relative)) -plugin_dir_SQ = $(subst ','\'',$(plugin_dir)) +plugin_traceevent_dir_SQ = $(subst ','\'',$(plugin_traceevent_dir)) python_dir_SQ = $(subst ','\'',$(python_dir)) VAR_DIR = -DVAR_DIR="$(var_dir)" @@ -85,10 +85,10 @@ HELP_DIR_SQ = '$(subst ','\'',$(HELP_DIR))' BASH_COMPLETE_DIR ?= /etc/bash_completion.d -export PLUGIN_DIR +export PLUGIN_DIR_TRACEEVENT export PYTHON_DIR export PYTHON_DIR_SQ -export plugin_dir_SQ +export plugin_traceevent_dir_SQ export python_dir_SQ export var_dir @@ -239,7 +239,7 @@ LIBS += -laudit endif # Append required CFLAGS -override CFLAGS += $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR) +override CFLAGS += $(INCLUDES) $(PLUGIN_DIR_TRACEEVENT_SQ) $(VAR_DIR) override CFLAGS += $(udis86-flags) $(blk-flags) override LDFLAGS += $(udis86-ldflags) diff --git a/lib/traceevent/event-plugin.c b/lib/traceevent/event-plugin.c index 4fc4ee3..88cd5f0 100644 --- a/lib/traceevent/event-plugin.c +++ b/lib/traceevent/event-plugin.c @@ -20,7 +20,7 @@ #include "event-utils.h" #include "trace-seq.h" -#define LOCAL_PLUGIN_DIR ".traceevent/plugins" +#define LOCAL_PLUGIN_DIR ".local/lib/traceevent/plugins/" static struct registered_plugin_options { struct registered_plugin_options *next; @@ -579,9 +579,9 @@ void tep_load_plugins_hook(struct tep_handle *tep, const char *suffix, * If a system plugin directory was defined, * check that first. */ -#ifdef PLUGIN_DIR +#ifdef PLUGIN_TRACEEVENT_DIR if (!tep || !(tep->flags & TEP_DISABLE_SYS_PLUGINS)) - load_plugins_dir(tep, suffix, PLUGIN_DIR, + load_plugins_dir(tep, suffix, PLUGIN_TRACEEVENT_DIR, load_plugin, data); #endif diff --git a/lib/traceevent/plugins/Makefile b/lib/traceevent/plugins/Makefile index 061d919..4050019 100644 --- a/lib/traceevent/plugins/Makefile +++ b/lib/traceevent/plugins/Makefile @@ -53,11 +53,11 @@ $(bdir)/plugin_python_loader.so: $(bdir)/%.so: $(bdir)/%.o PLUGINS_INSTALL = $(subst .so,.install,$(PLUGINS)) $(PLUGINS_INSTALL): $(bdir)/%.install : $(bdir)/%.so force - $(Q)$(call do_install_data,$<,$(plugin_dir_SQ)) + $(Q)$(call do_install_data,$<,$(plugin_traceevent_dir_SQ)) install_plugins: $(PLUGINS_INSTALL) -# The following targets are necessary to trigger a rebuild when $(PLUGIN_DIR) +# The following targets are necessary to trigger a rebuild when $(PLUGIN_DIR_TRACEEVENT) # and $(PYTHON_DIR) change. Without them, a full clean build would necessary # in order to get the binaries updated. -- 2.21.0