From patchwork Thu Aug 1 07:49:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 11070217 X-Patchwork-Delegate: rostedt@goodmis.org 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 3637A13B1 for ; Thu, 1 Aug 2019 07:50:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C84F2849D for ; Thu, 1 Aug 2019 07:50:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20C8D284A5; Thu, 1 Aug 2019 07:50:09 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 BFCAD2849D for ; Thu, 1 Aug 2019 07:50:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725946AbfHAHuI (ORCPT ); Thu, 1 Aug 2019 03:50:08 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50376 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728843AbfHAHuI (ORCPT ); Thu, 1 Aug 2019 03:50:08 -0400 Received: by mail-wm1-f67.google.com with SMTP id v15so63550001wml.0 for ; Thu, 01 Aug 2019 00:50:06 -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=rHqZrtGNQYN/qI3hapu35cvs2EXgA/Fjb3EpFIfyXmo=; b=oXzYAfugpF8ZqqoIV9syFzYR2os+OXK/ItW7X3EWg7kXpXXqz/IMc6umIivjgzk7E1 hnzC1zbt8jWA18dGGK3iKnDumlRre8i8FiQovDaTF0/kulcJfojl+N+byJxaijPAfs4t HKeZzW7MUJNQYOiTXBxpJ9o3sDxZ4ivyyfFMt2nWgGg2iq4N7/yX3vQ7S1f5HJStBhqz zCQKHZDouV6i+fY1f7HTt06ZwgvttfUcJ9aT7yCdt910p25NzTYdT4lWiHxatf+uqXsi trPW3bLWPpy/gZmF2xqHfgle+24FbQgJt9RLu3gch45NB6p518X5ajYbz/3Aeq9Qztvn fqQQ== 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=rHqZrtGNQYN/qI3hapu35cvs2EXgA/Fjb3EpFIfyXmo=; b=qtMJPFmVk3tcblssFvm1yqOHK7HmxvGmxU0jx+jlI620wPF7JrtnMggVwf1V3oRSzE 0+jCEQjn8fzV/ds5RiovEcrNYYcWqFb+ORNMeLPlHvNEDIAqd7rB78I/gvPYLNViutUb KZHG/0lFWAu7gqzUtU5PVil5ndftQ0B9HXDjLs0WjRRBJqy5H/8AbPabqsH0Suljlmlk QctDhGzXGFKYUuHym1fqltqNKHUqs2X8YEE5m0moxDWbGhgxpiNxJGwJwhLJgaTDhqDn lKTe/CsYfoL+s4itDH/ndgBXpLVHkTwm664MplpU8kzsIo9/gimsLMRMe5L6qB9eJjTv SKXQ== X-Gm-Message-State: APjAAAVkVE1LzuwrATTJGzDqloZcMa+/R3/cCcw4LrMBbrIPo86OSIx8 AJ5CkfTLhkiKGEkgs0ueiCNpLeaYIt4= X-Google-Smtp-Source: APXvYqx0h5aeORwCd7H6xcxN8sxqJqUQRBfsU/LD6R8pNfcbBFd18Z468mmysFl45k5ImtNOJ+S1oA== X-Received: by 2002:a1c:e715:: with SMTP id e21mr117893045wmh.16.1564645806324; Thu, 01 Aug 2019 00:50:06 -0700 (PDT) Received: from oberon.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id u2sm4033483wmc.3.2019.08.01.00.50.05 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 00:50:05 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v3 3/3] tools/lib/traceevent: Change user's plugin directory Date: Thu, 1 Aug 2019 10:49:59 +0300 Message-Id: <20190801074959.22023-4-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190801074959.22023-1-tz.stoyanov@gmail.com> References: <20190801074959.22023-1-tz.stoyanov@gmail.com> 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: 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/ Suggested-by: Patrick McLean Signed-off-by: Tzvetomir Stoyanov --- tools/lib/traceevent/Makefile | 6 +++--- tools/lib/traceevent/event-plugin.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index 3292c290654f..86ce17a1f7fb 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -62,15 +62,15 @@ set_plugin_dir := 1 # Set plugin_dir to preffered global plugin location # If we install under $HOME directory we go under -# $(HOME)/.traceevent/plugins +# $(HOME)/.local/lib/traceevent/plugins # # We dont set PLUGIN_DIR in case we install under $HOME # directory, because by default the code looks under: -# $(HOME)/.traceevent/plugins by default. +# $(HOME)/.local/lib/traceevent/plugins by default. # ifeq ($(plugin_dir),) ifeq ($(prefix),$(HOME)) -override plugin_dir = $(HOME)/.traceevent/plugins +override plugin_dir = $(HOME)/.local/lib/traceevent/plugins set_plugin_dir := 0 else override plugin_dir = $(libdir)/traceevent/plugins diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c index 8ca28de9337a..e1f7ddd5a6cf 100644 --- a/tools/lib/traceevent/event-plugin.c +++ b/tools/lib/traceevent/event-plugin.c @@ -18,7 +18,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;