diff --git a/backport-trace-cmd-report-Fix-typos-in-error-messages.patch b/backport-trace-cmd-report-Fix-typos-in-error-messages.patch new file mode 100644 index 0000000000000000000000000000000000000000..0ddd8fb13764215ecb224cc5161d6850416b51ed --- /dev/null +++ b/backport-trace-cmd-report-Fix-typos-in-error-messages.patch @@ -0,0 +1,41 @@ +From 9fd5f8ecd0bb98b6fdcfe75118b535f613226b9f Mon Sep 17 00:00:00 2001 +From: "Tzvetomir Stoyanov (VMware)" +Date: Tue, 14 Sep 2021 16:12:13 +0300 +Subject: [PATCH] trace-cmd report: Fix typos in error messages + +Fixed typos in "trace-cmd report" messages that report reading and +parsing errors. + +Link: https://lore.kernel.org/linux-trace-devel/20210914131232.3964615-3-tz.stoyanov@gmail.com + +Signed-off-by: Tzvetomir Stoyanov (VMware) +Signed-off-by: Steven Rostedt (VMware) +--- + tracecmd/trace-read.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tracecmd/trace-read.c b/tracecmd/trace-read.c +index 6f43c1d2..31724b09 100644 +--- a/tracecmd/trace-read.c ++++ b/tracecmd/trace-read.c +@@ -1290,7 +1290,7 @@ static void read_data_info(struct list_head *handle_list, enum output_type otype + die("error in reading buffer instance"); + new_handle = tracecmd_buffer_instance_handle(handles->handle, i); + if (!new_handle) { +- warning("could not retreive handle %s", name); ++ warning("could not retrieve handle %s", name); + continue; + } + add_handle(new_handle, name); +@@ -1324,7 +1324,7 @@ static void read_data_info(struct list_head *handle_list, enum output_type otype + if (last_record) { + int cpu = last_record->cpu; + if (cpu >= last_handle->cpus) +- die("cpu %d creater than %d\n", cpu, last_handle->cpus); ++ die("cpu %d greater than %d\n", cpu, last_handle->cpus); + if (tscheck && + last_handle->last_timestamp[cpu] > last_record->ts) { + errno = 0; +-- +2.33.0 + diff --git a/trace-cmd.spec b/trace-cmd.spec index b8c6b84ac5c12fd9665a4df7d8b1beea5613c6c3..0ec47d2ab8d2999d33375d297f6c2a3543fcb0e6 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -1,11 +1,14 @@ Name: trace-cmd Version: 2.9.2 -Release: 3 +Release: 4 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 Source0: https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/%{name}-v%{version}.tar.gz Source1: kernelshark.desktop + +Patch0001: backport-trace-cmd-report-Fix-typos-in-error-messages.patch + BuildRequires: gcc xmlto asciidoc mlocate libxml2-devel chrpath BuildRequires: gtk2-devel glib2-devel desktop-file-utils libtraceevent-devel Provides: kernelshark @@ -64,6 +67,9 @@ echo "%{_bindir}/%{name}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.co %{_mandir}/man5/* %changelog +* Fri Jan 06 2023 Bolehu - 2.9.2-4 +- trace-cmd report: Fix typos in error messages + * Tue Dec 06 2022 yaoxin - 2.9.2-3 - Add /sbin/ldconfig to post and postun @@ -73,7 +79,7 @@ echo "%{_bindir}/%{name}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.co * Tue Jan 18 2022 houyingchao - 2.9.2-1 - Upgrade to 2.9.2 version -* Fri July 30 2021 Guoxiaoqi - 2.7-6 +* Fri Jul 30 2021 Guoxiaoqi - 2.7-6 - Fix build with gcc-10 * Wed Oct 28 2020 Anan Fu - 2.7-5