| From e329a456940ffbbaef403e5b3bbc0889d496a4a4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 5 Aug 2019 16:43:15 -0400 |
| Subject: libtraceevent: Change users plugin directory |
| |
| From: Tzvetomir Stoyanov <tstoyanov@vmware.com> |
| |
| [ Upstream commit e97fd1383cd77c467d2aed7fa4e596789df83977 ] |
| |
| To be compliant with XDG user directory layout, the user's plugin |
| directory is changed from ~/.traceevent/plugins to |
| ~/.local/lib/traceevent/plugins/ |
| |
| Suggested-by: Patrick McLean <chutzpah@gentoo.org> |
| Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com> |
| Cc: Andrew Morton <akpm@linux-foundation.org> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Patrick McLean <chutzpah@gentoo.org> |
| Cc: linux-trace-devel@vger.kernel.org |
| Link: https://lore.kernel.org/linux-trace-devel/20190313144206.41e75cf8@patrickm/ |
| Link: http://lore.kernel.org/linux-trace-devel/20190801074959.22023-4-tz.stoyanov@gmail.com |
| Link: http://lore.kernel.org/lkml/20190805204355.344622683@goodmis.org |
| Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 7851df1490e0a..cc3315da6dc39 100644 |
| --- a/tools/lib/traceevent/Makefile |
| +++ b/tools/lib/traceevent/Makefile |
| @@ -54,15 +54,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 a16756ae35267..5fe7889606a23 100644 |
| --- a/tools/lib/traceevent/event-plugin.c |
| +++ b/tools/lib/traceevent/event-plugin.c |
| @@ -30,7 +30,7 @@ |
| #include "event-parse.h" |
| #include "event-utils.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; |
| -- |
| 2.20.1 |
| |