From 59e940ce6aded55c868167e36bae1d94e172743a Mon Sep 17 00:00:00 2001 From: Bolehu Date: Fri, 6 Jan 2023 16:30:12 +0800 Subject: [PATCH] Changing default install path of plugins Signed-off-by: Bolehu --- ...ging-default-install-path-of-plugins.patch | 33 +++++++++++++++++++ trace-cmd.spec | 6 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 backport-Changing-default-install-path-of-plugins.patch diff --git a/backport-Changing-default-install-path-of-plugins.patch b/backport-Changing-default-install-path-of-plugins.patch new file mode 100644 index 0000000..31ddfd3 --- /dev/null +++ b/backport-Changing-default-install-path-of-plugins.patch @@ -0,0 +1,33 @@ +From 67b2de06ccd249f2b0dcc9b3e196e4fbcb943066 Mon Sep 17 00:00:00 2001 +From: Peter Bergin +Date: Fri, 30 Apr 2021 17:24:30 +0200 +Subject: [PATCH] trace-cmd: Changing default install path of plugins + +README file states that default install path for plugins +is '/usr/local/lib/trace-cmd/plugins' but Makefile did +specify other location. + +Link: https://lore.kernel.org/linux-trace-devel/20210430152430.1958285-1-peter@berginkonsult.se + +Signed-off-by: Peter Bergin +Signed-off-by: Steven Rostedt (VMware) +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index ec73b5c6..0d8fea0d 100644 +--- a/Makefile ++++ b/Makefile +@@ -94,7 +94,7 @@ plugin_tracecmd_dir = $(libdir)/trace-cmd/plugins + python_dir ?= $(libdir)/traceevent/python + var_dir = $(HOME)/.trace-cmd/ + else +-plugin_traceevent_dir = $(libdir)/traceevent/plugins ++plugin_traceevent_dir = $(libdir)/trace-cmd/plugins + python_dir ?= $(libdir)/trace-cmd/python + PLUGIN_DIR_TRACEEVENT = -DPLUGIN_TRACEEVENT_DIR="$(plugin_traceevent_dir)" + PLUGIN_DIR_TRACECMD = -DPLUGIN_TRACECMD_DIR="$(plugin_tracecmd_dir)" +-- +2.33.0 + diff --git a/trace-cmd.spec b/trace-cmd.spec index dfebc94..f4af0f3 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -1,6 +1,6 @@ Name: trace-cmd Version: 2.9.2 -Release: 7 +Release: 8 Summary: A front-end for Ftrace License: GPLv2 and LGPLv2 URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary @@ -11,6 +11,7 @@ Patch0001: backport-trace-cmd-report-Fix-typos-in-error-messages.patch Patch0002: backport-trace-cmd-library-Fix-version-string-memory-leak.patch Patch0003: backport-trace-cmd-library-Fixed-a-memory-leak-on-input-handl.patch Patch0004: backport-Remove-unneeded-multiply-in-events-timesta.patch +Patch0005: backport-Changing-default-install-path-of-plugins.patch BuildRequires: gcc xmlto asciidoc mlocate libxml2-devel chrpath BuildRequires: gtk2-devel glib2-devel desktop-file-utils libtraceevent-devel @@ -70,6 +71,9 @@ echo "%{_bindir}/%{name}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.co %{_mandir}/man5/* %changelog +* Sat Jan 07 2023 Bolehu - 2.9.2-8 +- Changing default install path of plugins + * Sat Jan 07 2023 Bolehu - 2.9.2-7 - Remove unneeded multiply in events timestamp reading