Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3135833ybj; Mon, 23 Sep 2019 15:31:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzddr4uQZIObPGsGShdM5SZ+z/eqVpvmoaUVbXKGSCNiqdjvpvZZB0bjF4DLn3hAIT+Qg5l X-Received: by 2002:a50:c052:: with SMTP id u18mr2566853edd.88.1569277873673; Mon, 23 Sep 2019 15:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569277873; cv=none; d=google.com; s=arc-20160816; b=q5BtXqv0KBkXRskUbnrk0jUnXrbe4zCM0/DG1R5XIeFmqn8xuqkBgmiVaFwjR+oCd2 zDKN6osBQeiods01K6Rmiof/qVX8SE4fgleD7qWKPNNBo/j2UtESm07PTBJaNdYpyDKE 1Fg6YEkvMM0F/ykodZ73FOy9sxRADq3ZaFtJ3rLbaPIBbcJLWw8gUEV23GY1AKwRb/di J0EmVuoF+sVLDHaQ+ga9ViAFLdTTsu6ULXvINVDc0m/sdcbrbDj2fbVD7wQPZqBfUIw5 vEjY/m7F8wvo2IIvDwJrlWIt/Ux2oXF0vJXpQWiFl82wlqV/qvbHZal8tkXQa3hP6wCX 1CNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=36mYRP4jClcfAFDBxIWSlcSefS+aKWhv9+TMBRKcKMQ=; b=0N9PIG4gd+v+Mg4RhnOH9IiCD1VX+0wOSqIrPhif3U7CowcMn5jvwN6Qzf43+CZZEF XRbR69/0YghEt9vAdf1qlihfKOdndYnZCL2SbCkxfNqG8HfNSmZ+j+c5gW1wOmBN2fiV 9VfwwORbkRkxllOgireo49D7q+t/RN4e/rhVw89419ofrqEq31dv6DsnP4cEOhn7MiW4 i0KfWdsiVZDbZpWYgFsjOA90yj8mi02SyO8qs2oPI0apFgunD9ZfjFaCk/8P36ZG3ZIa OuJTtd3Z/Rz0DPsvvdul1EjTuKGkcN/f2jKRBZPYyFC/6emwrEZfnQM3GXzudNZHw9/0 vkpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gcfthD4O; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e4si5602738ejb.303.2019.09.23.15.30.50; Mon, 23 Sep 2019 15:31:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gcfthD4O; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391490AbfIVSsO (ORCPT + 99 others); Sun, 22 Sep 2019 14:48:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:44788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388303AbfIVSsG (ORCPT ); Sun, 22 Sep 2019 14:48:06 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 96E45214AF; Sun, 22 Sep 2019 18:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178084; bh=gDoMJ/kb/DKmiZLAj1iPf+wvICmVlOUmxNJiEv9/iT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gcfthD4Oi0Mvvd4dfYcM62kK3+vAhfQJp3JHPteG13BTpM3ShDDYulLnkNULZO1/g /zRXyY9xzbOeU2cRksrzl9XOo58QQBsxLpD/+NtVOieotd22d4x9dPpYppnWpOt2hi VDbyeDiu2g4mYmcjWABJxZ+weJExGn/zShwDbS8s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tzvetomir Stoyanov , Patrick McLean , Andrew Morton , Jiri Olsa , Namhyung Kim , linux-trace-devel@vger.kernel.org, Steven Rostedt , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 5.3 153/203] libtraceevent: Change users plugin directory Date: Sun, 22 Sep 2019 14:42:59 -0400 Message-Id: <20190922184350.30563-153-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tzvetomir Stoyanov [ 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 Signed-off-by: Tzvetomir Stoyanov Cc: Andrew Morton Cc: Jiri Olsa Cc: Namhyung Kim Cc: Patrick McLean 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) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- 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 3292c290654f6..86ce17a1f7fb6 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 8ca28de9337a5..e1f7ddd5a6cf0 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; -- 2.20.1