The package rpms/trace-cmd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/trace-cmd.git/commit/?id=9a42b883....
Change:
+ExcludeArch: %{ix86} %{arm}
Thanks.
Full change:
============
commit 158bcbb1c7976f4245d7ede5454c5f00e318a4a0
Author: Ziqian SUN(Zamir) <zsun(a)redhat.com>
Date: Fri Apr 15 18:19:44 2022 +0800
Remove man type 3 from file lists
Signed-off-by: Ziqian SUN(Zamir) <zsun(a)redhat.com>
diff --git a/trace-cmd.spec b/trace-cmd.spec
index 6f2c12d..15bdebe 100644
--- a/trace-cmd.spec
+++ b/trace-cmd.spec
@@ -104,7 +104,6 @@ rm -rf %{buildroot}/%{_mandir}/man3/*
%{_sysconfdir}/sysconfig/trace-cmd.conf
%{_unitdir}/trace-cmd.service
%{_udevrulesdir}/98-trace-cmd.rules
-%{_mandir}/man3/tracecmd*
%files python3
%doc Documentation/README.PythonPlugin
commit 33b7a99761869b8f94d0bb651d990f960750f456
Author: Ziqian SUN(Zamir) <zsun(a)redhat.com>
Date: Fri Apr 15 18:10:15 2022 +0800
Remoe libtracecmd man pages from trace-cmd
Signed-off-by: Ziqian SUN(Zamir) <zsun(a)redhat.com>
diff --git a/trace-cmd.spec b/trace-cmd.spec
index 7f47599..6f2c12d 100644
--- a/trace-cmd.spec
+++ b/trace-cmd.spec
@@ -6,7 +6,7 @@
Name: trace-cmd
Version: %{srcversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2
Summary: A user interface to Ftrace
Requires: libtracecmd
@@ -89,7 +89,7 @@ install -p -m 644 trace-cmd.conf %{buildroot}/%{_sysconfdir}/sysconfig/
install -p -m 644 trace-cmd.service %{buildroot}/%{_unitdir}/
install -p -m 644 98-trace-cmd.rules %{buildroot}/%{_udevrulesdir}/
rm -rf %{buildroot}/%{_docdir}/libtracecmd-doc
-rm -rf %{buildroot}/%{_mandir}/man3/libtracecmd*
+rm -rf %{buildroot}/%{_mandir}/man3/*
%preun
%systemd_preun %{name}.service
@@ -111,7 +111,10 @@ rm -rf %{buildroot}/%{_mandir}/man3/libtracecmd*
%{_libdir}/%{name}/python/
%changelog
-* Wed Apr 13 2022 Zamir SUN <sztsian(a)gmail.com> - 3.0.3
+* Fri Apr 15 2022 Zamir SUN <sztsian(a)gmail.com> - 3.0.3-2
+- Get rid of the libtracecmd man pages
+
+* Wed Apr 13 2022 Zamir SUN <sztsian(a)gmail.com> - 3.0.3-1
- Update to 3.0.3
* Fri Mar 18 2022 KUDOH Takashi <t-kudoh(a)fujitsu.com> - 2.9.7-2
commit 9a42b883eccfe24ecbea5925465fcaff5a33a5b8
Author: Ziqian SUN(Zamir) <zsun(a)redhat.com>
Date: Fri Apr 15 17:17:55 2022 +0800
Update to 3.0.3
Signed-off-by: Ziqian SUN(Zamir) <zsun(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 2f2d543..0ef4ca1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/trace-cmd-v2.9.1.tar.gz
/trace-cmd-v2.9.2.tar.gz
/trace-cmd-v2.9.7.tar.gz
+/trace-cmd-v3.0.3.tar.gz
diff --git a/sources b/sources
index a1ddbb1..da31ada 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (trace-cmd-v2.9.7.tar.gz) =
f678ea380c0fe7e4ea9ed43d9024e418376fdf435043937e680d65a3728b9eefda2e6dcff0e02846267485317f764e7f7123812f5d5df5b63761a169f57520b9
+SHA512 (trace-cmd-v3.0.3.tar.gz) =
896a5b2d230eb0ee19e27bb71e485acd163a3225062015a0dae5b4b55eb48d8d1cdc034f7881751523384f13e20adfd8b7bc0a53392fff8029bf1403445cc785
diff --git a/trace-cmd.spec b/trace-cmd.spec
index 1ed46b3..7f47599 100644
--- a/trace-cmd.spec
+++ b/trace-cmd.spec
@@ -2,19 +2,19 @@
#%%global git_commit trace-cmd-v2.6.2
#%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36
-%global srcversion 2.9.7
+%global srcversion 3.0.3
Name: trace-cmd
Version: %{srcversion}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: GPLv2 and LGPLv2
Summary: A user interface to Ftrace
Requires: libtracecmd
Requires: libtracefs
Requires: libtraceevent
-# Exclude i686 due to build failure
-#
https://bugzilla.redhat.com/show_bug.cgi?id=2055949
-ExcludeArch: %{ix86}
+
+ExcludeArch: %{ix86} %{arm}
+
URL:
http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary
# If upstream does not provide tarballs, to generate:
# git clone
https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
@@ -37,12 +37,14 @@ BuildRequires: cmake
BuildRequires: qt5-qtbase-devel
BuildRequires: freeglut-devel
BuildRequires: json-c-devel
-BuildRequires: libtraceevent-devel
-BuildRequires: libtracefs-devel
+BuildRequires: libtraceevent-devel >= 1.5.3
+BuildRequires: libtracefs-devel >= 1.3.1
BuildRequires: audit-libs-devel
BuildRequires: chrpath
BuildRequires: swig
BuildRequires: systemd-rpm-macros
+BuildRequires: libtracecmd-devel
+BuildRequires: libzstd-devel
%description
trace-cmd is a user interface to Ftrace. Instead of needing to use the
@@ -57,21 +59,6 @@ BuildRequires: python3-devel
%description python3
Python plugin support for trace-cmd
-%package -n libtracecmd
-Summary: Libraries of trace-cmd
-Version: 0
-
-%description -n libtracecmd
-The libtracecmd library
-
-%package -n libtracecmd-devel
-Summary: Development files for libtracecmd
-Version: 0
-Requires: libtracecmd%{_isa} = %{version}-%{release}
-
-%description -n libtracecmd-devel
-Development files of the libtracecmd library
-
%prep
%autosetup -n %{name}-v%{srcversion}
cp %{SOURCE1} .
@@ -80,20 +67,18 @@ cp %{SOURCE3} .
%build
# MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
-# -z muldefs to workaround the enforcing multi definition check of gcc10.
-# and it need to be removed once upstream fixed the variable name
MANPAGE_DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep manpages/docbook.xsl`
CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags}"
BUILD_TYPE=Release \
make V=9999999999 MANPAGE_DOCBOOK_XSL=$MANPAGE_DOCBOOK_XSL \
prefix=%{_prefix} libdir=%{_libdir} \
- PYTHON_VERS=python3 all_cmd doc libtracecmd.so
+ PYTHON_VERS=python3 all_cmd doc
for i in python/*.py ; do
sed -i 's/env python2/python3/g' $i
done
chrpath --delete tracecmd/trace-cmd
%install
-make libdir=%{_libdir} prefix=%{_prefix} V=1 DESTDIR=%{buildroot}/
CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags} -z muldefs
" BUILD_TYPE=Release install install_doc install_python install_libs
+make libdir=%{_libdir} prefix=%{_prefix} V=1 DESTDIR=%{buildroot}/
CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags} -z muldefs
" BUILD_TYPE=Release install install_doc install_python
find %{buildroot}%{_mandir} -type f | xargs chmod u-x,g-x,o-x
find %{buildroot}%{_datadir} -type f | xargs chmod u-x,g-x,o-x
find %{buildroot}%{_libdir} -type f -iname "*.so" | xargs chmod 0755
@@ -103,6 +88,8 @@ mkdir -p -m755 %{buildroot}/%{_udevrulesdir}/
install -p -m 644 trace-cmd.conf %{buildroot}/%{_sysconfdir}/sysconfig/
install -p -m 644 trace-cmd.service %{buildroot}/%{_unitdir}/
install -p -m 644 98-trace-cmd.rules %{buildroot}/%{_udevrulesdir}/
+rm -rf %{buildroot}/%{_docdir}/libtracecmd-doc
+rm -rf %{buildroot}/%{_mandir}/man3/libtracecmd*
%preun
%systemd_preun %{name}.service
@@ -112,29 +99,21 @@ install -p -m 644 98-trace-cmd.rules %{buildroot}/%{_udevrulesdir}/
%{_bindir}/trace-cmd
%{_mandir}/man1/%{name}*
%{_mandir}/man5/%{name}*
+%{_docdir}/trace-cmd/trace-cmd*.html
%{_sysconfdir}/bash_completion.d/trace-cmd.bash
%{_sysconfdir}/sysconfig/trace-cmd.conf
%{_unitdir}/trace-cmd.service
%{_udevrulesdir}/98-trace-cmd.rules
+%{_mandir}/man3/tracecmd*
%files python3
%doc Documentation/README.PythonPlugin
%{_libdir}/%{name}/python/
-%files -n libtracecmd
-%doc COPYING COPYING.LIB README
-%{_libdir}/libtracecmd.so.0
-%{_libdir}/libtracecmd.so.0.0.1
-%{_docdir}/libtracecmd-doc
-%{_mandir}/man3/libtracecmd*
-%{_mandir}/man3/tracecmd*
-
-%files -n libtracecmd-devel
-%{_libdir}/pkgconfig/libtracecmd.pc
-%{_libdir}/libtracecmd.so
-%{_includedir}/trace-cmd
-
%changelog
+* Wed Apr 13 2022 Zamir SUN <sztsian(a)gmail.com> - 3.0.3
+- Update to 3.0.3
+
* Fri Mar 18 2022 KUDOH Takashi <t-kudoh(a)fujitsu.com> - 2.9.7-2
- Add flight recoder service
commit 14be4ebb0d2a86f8a4f8ae3d6cddab35397426f7
Author: root <root(a)localhost.localdomain>
Date: Thu Mar 24 15:31:34 2022 +0900
Add flight recoder service
Flight recorder service, trace-cmd.service, provides a feature to
automatically start trace-cmd command at every system start-up and to
automatically reload trace-cmd command at every kernel module loading
to enable tracepoints provided by kernel modules.
Thanks to this feature, once system panic occurs, users retrieve
ftrace ring buffer from crash dump that is created by some crash dump
mechanism such as kdump and virsh dump using crash trace command [1]
and can perform failure analysis based on ftrace event logs.
Historically, this feature has been provided only in the RHEL7 and
RHEL8 versions of trace-cmd packages so far. However, with the
introduction of CentOS Stream, RHEL's development process changed and
now CentOS Stream is an upstream of RHEL and Fedora Linux is the
upstream of CentOS Stream [2], due to which, Red Hat now follows
upstream-first policy strictly and requires this feature be provided
in its upstream.
[1]
https://src.fedoraproject.org/rpms/crash-trace-command
[2]
https://www.redhat.com/en/topics/linux/what-is-centos-stream
Signed-off-by: KUDOH Takashi <t-kudoh(a)fujitsu.com>
Signed-off-by: HATAYAMA Daisuke <d.hatayama(a)fujitsu.com>
diff --git a/98-trace-cmd.rules b/98-trace-cmd.rules
new file mode 100644
index 0000000..9575bd8
--- /dev/null
+++ b/98-trace-cmd.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="module", ACTION=="add", PROGRAM="/usr/bin/systemctl
is-active trace-cmd.service", PROGRAM="/usr/bin/systemctl reload
trace-cmd.service"
diff --git a/trace-cmd.conf b/trace-cmd.conf
new file mode 100644
index 0000000..85c4fbe
--- /dev/null
+++ b/trace-cmd.conf
@@ -0,0 +1,4 @@
+# ftrace based flightrecorder configuration file.
+
+# trace-cmd options
+OPTS="-b 2048 -i -e block -e irq -e mce -e module -e power -e sched -e signal -e
timer -e workqueue -e kvm -e net"
diff --git a/trace-cmd.service b/trace-cmd.service
new file mode 100644
index 0000000..27b07f5
--- /dev/null
+++ b/trace-cmd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=trace-cmd Flightrecorder
+DefaultDependencies=no
+Before=sysinit.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/sysconfig/trace-cmd.conf
+ExecStart=/usr/bin/trace-cmd start $OPTS
+ExecStop=/usr/bin/trace-cmd reset
+ExecReload=/usr/bin/trace-cmd start $OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/trace-cmd.spec b/trace-cmd.spec
index 9a4748a..1ed46b3 100644
--- a/trace-cmd.spec
+++ b/trace-cmd.spec
@@ -6,7 +6,7 @@
Name: trace-cmd
Version: %{srcversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2
Summary: A user interface to Ftrace
Requires: libtracecmd
@@ -21,6 +21,9 @@ URL:
http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary
# cd trace-cmd
# git archive --prefix=trace-cmd-%%{version}/ -o trace-cmd-v%%{version}.tar.gz
%%{git_commit}
Source0:
https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/tra...
+Source1: trace-cmd.conf
+Source2: trace-cmd.service
+Source3: 98-trace-cmd.rules
BuildRequires: make
BuildRequires: gcc
BuildRequires: xmlto
@@ -39,6 +42,7 @@ BuildRequires: libtracefs-devel
BuildRequires: audit-libs-devel
BuildRequires: chrpath
BuildRequires: swig
+BuildRequires: systemd-rpm-macros
%description
trace-cmd is a user interface to Ftrace. Instead of needing to use the
@@ -70,6 +74,9 @@ Development files of the libtracecmd library
%prep
%autosetup -n %{name}-v%{srcversion}
+cp %{SOURCE1} .
+cp %{SOURCE2} .
+cp %{SOURCE3} .
%build
# MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
@@ -90,7 +97,15 @@ make libdir=%{_libdir} prefix=%{_prefix} V=1 DESTDIR=%{buildroot}/
CFLAGS="%{opt
find %{buildroot}%{_mandir} -type f | xargs chmod u-x,g-x,o-x
find %{buildroot}%{_datadir} -type f | xargs chmod u-x,g-x,o-x
find %{buildroot}%{_libdir} -type f -iname "*.so" | xargs chmod 0755
-mkdir -p %{buildroot}/%{_sysconfdir}
+mkdir -p -m755 %{buildroot}/%{_sysconfdir}/sysconfig/
+mkdir -p -m755 %{buildroot}/%{_unitdir}/
+mkdir -p -m755 %{buildroot}/%{_udevrulesdir}/
+install -p -m 644 trace-cmd.conf %{buildroot}/%{_sysconfdir}/sysconfig/
+install -p -m 644 trace-cmd.service %{buildroot}/%{_unitdir}/
+install -p -m 644 98-trace-cmd.rules %{buildroot}/%{_udevrulesdir}/
+
+%preun
+%systemd_preun %{name}.service
%files
%doc COPYING COPYING.LIB README
@@ -98,6 +113,9 @@ mkdir -p %{buildroot}/%{_sysconfdir}
%{_mandir}/man1/%{name}*
%{_mandir}/man5/%{name}*
%{_sysconfdir}/bash_completion.d/trace-cmd.bash
+%{_sysconfdir}/sysconfig/trace-cmd.conf
+%{_unitdir}/trace-cmd.service
+%{_udevrulesdir}/98-trace-cmd.rules
%files python3
%doc Documentation/README.PythonPlugin
@@ -117,6 +135,9 @@ mkdir -p %{buildroot}/%{_sysconfdir}
%{_includedir}/trace-cmd
%changelog
+* Fri Mar 18 2022 KUDOH Takashi <t-kudoh(a)fujitsu.com> - 2.9.7-2
+- Add flight recoder service
+
* Wed Feb 16 2022 Zamir SUN <sztsian(a)gmail.com> - 2.9.7-1
- Update to 2.9.7