From 4e04f581a7bd835eaa239a76be8211dff3e71239 Mon Sep 17 00:00:00 2001 From: Jerome Marchand Date: Fri, 23 Apr 2021 15:40:32 +0200 Subject: [PATCH 01/26] Remove rpath from trace-cmd --- trace-cmd.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index 1010148..b47e17b 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace Requires: libtracecmd @@ -33,6 +33,7 @@ BuildRequires: qt5-qtbase-devel BuildRequires: freeglut-devel BuildRequires: json-c-devel BuildRequires: libtraceevent-devel +BuildRequires: chrpath %description trace-cmd is a user interface to Ftrace. Instead of needing to use the @@ -78,6 +79,7 @@ CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags}" BUILD_TYPE=Release 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 @@ -111,6 +113,9 @@ mkdir -p %{buildroot}/%{_sysconfdir} %{_includedir}/trace-cmd %changelog +* Fri Apr 23 2021 Jerome Marchand - 2.9.2-3 +- Build w/o rpath as per Fedora packaging guideline + * Mon Mar 29 2021 Zamir SUN - 2.9.2-2 - Fix dependency of libtracecmd - Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1943919 From 930eae7a81afb6c25e16d47723e3d7cc00ce627a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:32:47 +0000 Subject: [PATCH 02/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- trace-cmd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index b47e17b..f0fe463 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace Requires: libtracecmd @@ -113,6 +113,9 @@ mkdir -p %{buildroot}/%{_sysconfdir} %{_includedir}/trace-cmd %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.9.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Apr 23 2021 Jerome Marchand - 2.9.2-3 - Build w/o rpath as per Fedora packaging guideline From f8b8a6ca8936677c4c6b4dd94ab5064b391016e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:00:03 +0000 Subject: [PATCH 03/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- trace-cmd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index f0fe463..8713dad 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace Requires: libtracecmd @@ -113,6 +113,9 @@ mkdir -p %{buildroot}/%{_sysconfdir} %{_includedir}/trace-cmd %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.9.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.9.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b489389cf9b5b29732279352e8d63a2bfadca02f Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Fri, 18 Feb 2022 10:32:41 +0800 Subject: [PATCH 04/26] Update to 2.9.7 and exclude i686 --- .gitignore | 1 + sources | 2 +- trace-cmd.spec | 15 +++++++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7712876..2f2d543 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /trace-cmd-v2.8.3.tar.gz /trace-cmd-v2.9.1.tar.gz /trace-cmd-v2.9.2.tar.gz +/trace-cmd-v2.9.7.tar.gz diff --git a/sources b/sources index 795af90..a1ddbb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trace-cmd-v2.9.2.tar.gz) = ddb32446a5185ee6414f297de1d48fe39a7141c833a608fd3977dd0efd496bf18b59ea5d064316e7deb86c1cd82f33dcea4c0c145bb31b2473e85593f4d0d461 +SHA512 (trace-cmd-v2.9.7.tar.gz) = f678ea380c0fe7e4ea9ed43d9024e418376fdf435043937e680d65a3728b9eefda2e6dcff0e02846267485317f764e7f7123812f5d5df5b63761a169f57520b9 diff --git a/trace-cmd.spec b/trace-cmd.spec index 8713dad..9a4748a 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -2,17 +2,19 @@ #%%global git_commit trace-cmd-v2.6.2 #%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36 -%global srcversion 2.9.2 +%global srcversion 2.9.7 Name: trace-cmd Version: %{srcversion} -Release: 5%{?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} 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 @@ -33,7 +35,10 @@ BuildRequires: qt5-qtbase-devel BuildRequires: freeglut-devel BuildRequires: json-c-devel BuildRequires: libtraceevent-devel +BuildRequires: libtracefs-devel +BuildRequires: audit-libs-devel BuildRequires: chrpath +BuildRequires: swig %description trace-cmd is a user interface to Ftrace. Instead of needing to use the @@ -43,7 +48,6 @@ tracers and will record into a data file. %package python3 Summary: Python plugin support for trace-cmd Requires: trace-cmd%{_isa} = %{version}-%{release} -BuildRequires: swig BuildRequires: python3-devel %description python3 @@ -113,6 +117,9 @@ mkdir -p %{buildroot}/%{_sysconfdir} %{_includedir}/trace-cmd %changelog +* Wed Feb 16 2022 Zamir SUN - 2.9.7-1 +- Update to 2.9.7 + * Sat Jan 22 2022 Fedora Release Engineering - 2.9.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 14be4ebb0d2a86f8a4f8ae3d6cddab35397426f7 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 24 Mar 2022 15:31:34 +0900 Subject: [PATCH 05/26] 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 Signed-off-by: HATAYAMA Daisuke --- 98-trace-cmd.rules | 1 + trace-cmd.conf | 4 ++++ trace-cmd.service | 15 +++++++++++++++ trace-cmd.spec | 25 +++++++++++++++++++++++-- 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 98-trace-cmd.rules create mode 100644 trace-cmd.conf create mode 100644 trace-cmd.service 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/trace-cmd-v%{srcversion}.tar.gz +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 - 2.9.7-2 +- Add flight recoder service + * Wed Feb 16 2022 Zamir SUN - 2.9.7-1 - Update to 2.9.7 From 9a42b883eccfe24ecbea5925465fcaff5a33a5b8 Mon Sep 17 00:00:00 2001 From: "Ziqian SUN(Zamir)" Date: Fri, 15 Apr 2022 17:17:55 +0800 Subject: [PATCH 06/26] Update to 3.0.3 Signed-off-by: Ziqian SUN(Zamir) --- .gitignore | 1 + sources | 2 +- trace-cmd.spec | 57 ++++++++++++++++---------------------------------- 3 files changed, 20 insertions(+), 40 deletions(-) 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 - 3.0.3 +- Update to 3.0.3 + * Fri Mar 18 2022 KUDOH Takashi - 2.9.7-2 - Add flight recoder service From 33b7a99761869b8f94d0bb651d990f960750f456 Mon Sep 17 00:00:00 2001 From: "Ziqian SUN(Zamir)" Date: Fri, 15 Apr 2022 18:10:15 +0800 Subject: [PATCH 07/26] Remoe libtracecmd man pages from trace-cmd Signed-off-by: Ziqian SUN(Zamir) --- trace-cmd.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 - 3.0.3 +* Fri Apr 15 2022 Zamir SUN - 3.0.3-2 +- Get rid of the libtracecmd man pages + +* Wed Apr 13 2022 Zamir SUN - 3.0.3-1 - Update to 3.0.3 * Fri Mar 18 2022 KUDOH Takashi - 2.9.7-2 From 158bcbb1c7976f4245d7ede5454c5f00e318a4a0 Mon Sep 17 00:00:00 2001 From: "Ziqian SUN(Zamir)" Date: Fri, 15 Apr 2022 18:19:44 +0800 Subject: [PATCH 08/26] Remove man type 3 from file lists Signed-off-by: Ziqian SUN(Zamir) --- trace-cmd.spec | 1 - 1 file changed, 1 deletion(-) 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 From 59a359a61011023d73d4a663c3b4b865b81347db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 10:47:01 +0000 Subject: [PATCH 09/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- trace-cmd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index 15bdebe..d695867 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace Requires: libtracecmd @@ -110,6 +110,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Apr 15 2022 Zamir SUN - 3.0.3-2 - Get rid of the libtracecmd man pages From 095246ccdfdb3bf2b2f40c8f3d50eb9359e8c667 Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Tue, 11 Oct 2022 21:22:01 +0800 Subject: [PATCH 10/26] Update to 3.1.4 Signed-off-by: Zamir SUN --- .gitignore | 1 + sources | 2 +- trace-cmd.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0ef4ca1..6df9296 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /trace-cmd-v2.9.2.tar.gz /trace-cmd-v2.9.7.tar.gz /trace-cmd-v3.0.3.tar.gz +/trace-cmd-v3.1.4.tar.gz diff --git a/sources b/sources index da31ada..1e0165a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trace-cmd-v3.0.3.tar.gz) = 896a5b2d230eb0ee19e27bb71e485acd163a3225062015a0dae5b4b55eb48d8d1cdc034f7881751523384f13e20adfd8b7bc0a53392fff8029bf1403445cc785 +SHA512 (trace-cmd-v3.1.4.tar.gz) = 93ad775c1767d2a02b72386a29867c3bc141171403c152c0c4cb907da16b5ae69100924279d9529083449c1774c97c35d5b4790b188bcd4930cfa69076cef0b8 diff --git a/trace-cmd.spec b/trace-cmd.spec index d695867..cc7849b 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -2,11 +2,11 @@ #%%global git_commit trace-cmd-v2.6.2 #%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36 -%global srcversion 3.0.3 +%global srcversion 3.1.4 Name: trace-cmd Version: %{srcversion} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace Requires: libtracecmd @@ -37,8 +37,8 @@ BuildRequires: cmake BuildRequires: qt5-qtbase-devel BuildRequires: freeglut-devel BuildRequires: json-c-devel -BuildRequires: libtraceevent-devel >= 1.5.3 -BuildRequires: libtracefs-devel >= 1.3.1 +BuildRequires: libtraceevent-devel >= 1.6.3 +BuildRequires: libtracefs-devel >= 1.5.0 BuildRequires: audit-libs-devel BuildRequires: chrpath BuildRequires: swig @@ -110,6 +110,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Tue Oct 11 2022 Zamir SUN - 3.1.4-1 +- Update to 3.1.4 + * Sat Jul 23 2022 Fedora Release Engineering - 3.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d9631ac81ad4f30b7ca5ed8a7d3b57131c545080 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:21:28 +0000 Subject: [PATCH 11/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- trace-cmd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index cc7849b..60520dc 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 @@ -110,6 +110,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Oct 11 2022 Zamir SUN - 3.1.4-1 - Update to 3.1.4 From 93cd9d216eb3d33698041ddb810a5c319e98d7b9 Mon Sep 17 00:00:00 2001 From: Jerome Marchand Date: Fri, 31 Mar 2023 12:26:18 +0200 Subject: [PATCH 12/26] Fix infinite loop in make Build is stuck in an infinite loop with make 4.4. Fix it. Also remove explicit library dependency to make fedpkg lint happy. Let rpmbuild take care of dependencies. Resolves: rhbz#2171770 Signed-off-by: Jerome Marchand --- ...cmd-Allow-building-with-GNU-Make-4.4.patch | 101 ++++++++++++++++++ trace-cmd.spec | 11 +- 2 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 trace-cmd-Allow-building-with-GNU-Make-4.4.patch diff --git a/trace-cmd-Allow-building-with-GNU-Make-4.4.patch b/trace-cmd-Allow-building-with-GNU-Make-4.4.patch new file mode 100644 index 0000000..399e5c1 --- /dev/null +++ b/trace-cmd-Allow-building-with-GNU-Make-4.4.patch @@ -0,0 +1,101 @@ +From a0aebf2d532b441f13d25d666c9845cbff568c95 Mon Sep 17 00:00:00 2001 +From: Michal Sojka +Date: Mon, 26 Dec 2022 17:49:51 +0100 +Subject: [PATCH] trace-cmd: Allow building with GNU Make 4.4 + +Make 4.4 introduces several backward incompatibilities and the result +is that building trace-cmd with it never finishes. It seems that make +ends up in some kind of infinite recursion. The symptoms are: + + $ make -d + GNU Make 4.4 + Built for x86_64-pc-linux-gnu + Copyright (C) 1988-2022 Free Software Foundation, Inc. + License GPLv3+: GNU GPL version 3 or later + This is free software: you are free to change and redistribute it. + There is NO WARRANTY, to the extent permitted by law. + Reading makefiles... + Reading makefile 'Makefile'... + Makefile:79: not recursively expanding pkgconfig_dir to export to shell function + Makefile:79: not recursively expanding pkgconfig_dir to export to shell function + Makefile:224: not recursively expanding LIBTRACECMD_SHARED_VERSION to export to shell function + Makefile:79: not recursively expanding pkgconfig_dir to export to shell function + Makefile:224: not recursively expanding LIBTRACECMD_SHARED_VERSION to export to shell function + Makefile:225: not recursively expanding LIBTRACECMD_SHARED_SO to export to shell function + Makefile:79: not recursively expanding pkgconfig_dir to export to shell function + Makefile:79: not recursively expanding pkgconfig_dir to export to shell function + +Build succeeds if recursively expanded variables (defined with '='), +which use $(shell ...) as its value, are replaced with simply expanded +variables (defined with ':='). + +Link: https://lore.kernel.org/linux-trace-devel/20221226164951.2632069-1-michal.sojka@cvut.cz + +Signed-off-by: Michal Sojka +Tested-by: Daniel Wagner +Signed-off-by: Steven Rostedt (Google) +--- + Makefile | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index e67cb77e..be3b0616 100644 +--- a/Makefile ++++ b/Makefile +@@ -221,8 +221,8 @@ LIBS ?= -ldl + LIBTRACECMD_DIR = $(obj)/lib/trace-cmd + LIBTRACECMD_STATIC = $(LIBTRACECMD_DIR)/libtracecmd.a + LIBTRACECMD_SHARED = $(LIBTRACECMD_DIR)/libtracecmd.so.$(LIBTRACECMD_VERSION) +-LIBTRACECMD_SHARED_VERSION = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/') +-LIBTRACECMD_SHARED_SO = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/') ++LIBTRACECMD_SHARED_VERSION := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/') ++LIBTRACECMD_SHARED_SO := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/') + + export LIBTRACECMD_STATIC LIBTRACECMD_SHARED + export LIBTRACECMD_SHARED_VERSION LIBTRACECMD_SHARED_SO +@@ -230,12 +230,12 @@ export LIBTRACECMD_SHARED_VERSION LIBTRACECMD_SHARED_SO + LIBTRACEEVENT=libtraceevent + LIBTRACEFS=libtracefs + +-TEST_LIBTRACEEVENT = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_MIN_VERSION) $(LIBTRACEEVENT) > /dev/null 2>&1 && echo y") +-TEST_LIBTRACEFS = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y") ++TEST_LIBTRACEEVENT := $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_MIN_VERSION) $(LIBTRACEEVENT) > /dev/null 2>&1 && echo y") ++TEST_LIBTRACEFS := $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y") + + ifeq ("$(TEST_LIBTRACEEVENT)", "y") +-LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)") +-LIBTRACEEVENT_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)") ++LIBTRACEEVENT_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)") ++LIBTRACEEVENT_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)") + else + .PHONY: warning + warning: +@@ -253,8 +253,8 @@ endif + export LIBTRACEEVENT_CFLAGS LIBTRACEEVENT_LDLAGS + + ifeq ("$(TEST_LIBTRACEFS)", "y") +-LIBTRACEFS_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)") +-LIBTRACEFS_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)") ++LIBTRACEFS_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)") ++LIBTRACEFS_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)") + else + .PHONY: warning + warning: +@@ -324,11 +324,11 @@ endif + export ZLIB_LDLAGS + + ifndef NO_LIBZSTD +-TEST_LIBZSTD = $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.4.0 libzstd > /dev/null 2>&1 && echo y") ++TEST_LIBZSTD := $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.4.0 libzstd > /dev/null 2>&1 && echo y") + + ifeq ("$(TEST_LIBZSTD)", "y") +-LIBZSTD_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags libzstd") +-LIBZSTD_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs libzstd") ++LIBZSTD_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags libzstd") ++LIBZSTD_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs libzstd") + CFLAGS += -DHAVE_ZSTD + ZSTD_INSTALLED=1 + $(info Have ZSTD compression support) +-- +2.39.2 + diff --git a/trace-cmd.spec b/trace-cmd.spec index 60520dc..3c9cce5 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,12 +6,9 @@ Name: trace-cmd Version: %{srcversion} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace -Requires: libtracecmd -Requires: libtracefs -Requires: libtraceevent ExcludeArch: %{ix86} %{arm} @@ -24,6 +21,8 @@ Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/t Source1: trace-cmd.conf Source2: trace-cmd.service Source3: 98-trace-cmd.rules +Patch0: trace-cmd-Allow-building-with-GNU-Make-4.4.patch + BuildRequires: make BuildRequires: gcc BuildRequires: xmlto @@ -110,6 +109,10 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Fri Mar 31 2023 Jerome Marchand - 3.1.4-3 +- Fix build: RHBZ#2171770 +- Also remove explicit lib dependency that fedpkg lint complains about. + * Sat Jan 21 2023 Fedora Release Engineering - 3.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8fd51942fee61c986b45022b8de47d119ab51113 Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Tue, 18 Apr 2023 21:57:12 +0800 Subject: [PATCH 13/26] Update to 3.1.6 --- .gitignore | 1 + sources | 2 +- ...cmd-Allow-building-with-GNU-Make-4.4.patch | 101 ------------------ trace-cmd.spec | 8 +- 4 files changed, 7 insertions(+), 105 deletions(-) delete mode 100644 trace-cmd-Allow-building-with-GNU-Make-4.4.patch diff --git a/.gitignore b/.gitignore index 6df9296..60d8372 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /trace-cmd-v2.9.7.tar.gz /trace-cmd-v3.0.3.tar.gz /trace-cmd-v3.1.4.tar.gz +/trace-cmd-v3.1.6.tar.gz diff --git a/sources b/sources index 1e0165a..8731c94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trace-cmd-v3.1.4.tar.gz) = 93ad775c1767d2a02b72386a29867c3bc141171403c152c0c4cb907da16b5ae69100924279d9529083449c1774c97c35d5b4790b188bcd4930cfa69076cef0b8 +SHA512 (trace-cmd-v3.1.6.tar.gz) = 2504863556a86759173f7114f5ab9a1d5641cefdd2bc9af64d8e5232d175e9c946fbb9dcec00d91b903e74b0e1bc52332877ddc9b705d6cfe2af9cb39797a446 diff --git a/trace-cmd-Allow-building-with-GNU-Make-4.4.patch b/trace-cmd-Allow-building-with-GNU-Make-4.4.patch deleted file mode 100644 index 399e5c1..0000000 --- a/trace-cmd-Allow-building-with-GNU-Make-4.4.patch +++ /dev/null @@ -1,101 +0,0 @@ -From a0aebf2d532b441f13d25d666c9845cbff568c95 Mon Sep 17 00:00:00 2001 -From: Michal Sojka -Date: Mon, 26 Dec 2022 17:49:51 +0100 -Subject: [PATCH] trace-cmd: Allow building with GNU Make 4.4 - -Make 4.4 introduces several backward incompatibilities and the result -is that building trace-cmd with it never finishes. It seems that make -ends up in some kind of infinite recursion. The symptoms are: - - $ make -d - GNU Make 4.4 - Built for x86_64-pc-linux-gnu - Copyright (C) 1988-2022 Free Software Foundation, Inc. - License GPLv3+: GNU GPL version 3 or later - This is free software: you are free to change and redistribute it. - There is NO WARRANTY, to the extent permitted by law. - Reading makefiles... - Reading makefile 'Makefile'... - Makefile:79: not recursively expanding pkgconfig_dir to export to shell function - Makefile:79: not recursively expanding pkgconfig_dir to export to shell function - Makefile:224: not recursively expanding LIBTRACECMD_SHARED_VERSION to export to shell function - Makefile:79: not recursively expanding pkgconfig_dir to export to shell function - Makefile:224: not recursively expanding LIBTRACECMD_SHARED_VERSION to export to shell function - Makefile:225: not recursively expanding LIBTRACECMD_SHARED_SO to export to shell function - Makefile:79: not recursively expanding pkgconfig_dir to export to shell function - Makefile:79: not recursively expanding pkgconfig_dir to export to shell function - -Build succeeds if recursively expanded variables (defined with '='), -which use $(shell ...) as its value, are replaced with simply expanded -variables (defined with ':='). - -Link: https://lore.kernel.org/linux-trace-devel/20221226164951.2632069-1-michal.sojka@cvut.cz - -Signed-off-by: Michal Sojka -Tested-by: Daniel Wagner -Signed-off-by: Steven Rostedt (Google) ---- - Makefile | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/Makefile b/Makefile -index e67cb77e..be3b0616 100644 ---- a/Makefile -+++ b/Makefile -@@ -221,8 +221,8 @@ LIBS ?= -ldl - LIBTRACECMD_DIR = $(obj)/lib/trace-cmd - LIBTRACECMD_STATIC = $(LIBTRACECMD_DIR)/libtracecmd.a - LIBTRACECMD_SHARED = $(LIBTRACECMD_DIR)/libtracecmd.so.$(LIBTRACECMD_VERSION) --LIBTRACECMD_SHARED_VERSION = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/') --LIBTRACECMD_SHARED_SO = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/') -+LIBTRACECMD_SHARED_VERSION := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/') -+LIBTRACECMD_SHARED_SO := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/') - - export LIBTRACECMD_STATIC LIBTRACECMD_SHARED - export LIBTRACECMD_SHARED_VERSION LIBTRACECMD_SHARED_SO -@@ -230,12 +230,12 @@ export LIBTRACECMD_SHARED_VERSION LIBTRACECMD_SHARED_SO - LIBTRACEEVENT=libtraceevent - LIBTRACEFS=libtracefs - --TEST_LIBTRACEEVENT = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_MIN_VERSION) $(LIBTRACEEVENT) > /dev/null 2>&1 && echo y") --TEST_LIBTRACEFS = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y") -+TEST_LIBTRACEEVENT := $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_MIN_VERSION) $(LIBTRACEEVENT) > /dev/null 2>&1 && echo y") -+TEST_LIBTRACEFS := $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y") - - ifeq ("$(TEST_LIBTRACEEVENT)", "y") --LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)") --LIBTRACEEVENT_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)") -+LIBTRACEEVENT_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)") -+LIBTRACEEVENT_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)") - else - .PHONY: warning - warning: -@@ -253,8 +253,8 @@ endif - export LIBTRACEEVENT_CFLAGS LIBTRACEEVENT_LDLAGS - - ifeq ("$(TEST_LIBTRACEFS)", "y") --LIBTRACEFS_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)") --LIBTRACEFS_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)") -+LIBTRACEFS_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)") -+LIBTRACEFS_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)") - else - .PHONY: warning - warning: -@@ -324,11 +324,11 @@ endif - export ZLIB_LDLAGS - - ifndef NO_LIBZSTD --TEST_LIBZSTD = $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.4.0 libzstd > /dev/null 2>&1 && echo y") -+TEST_LIBZSTD := $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.4.0 libzstd > /dev/null 2>&1 && echo y") - - ifeq ("$(TEST_LIBZSTD)", "y") --LIBZSTD_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags libzstd") --LIBZSTD_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs libzstd") -+LIBZSTD_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags libzstd") -+LIBZSTD_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs libzstd") - CFLAGS += -DHAVE_ZSTD - ZSTD_INSTALLED=1 - $(info Have ZSTD compression support) --- -2.39.2 - diff --git a/trace-cmd.spec b/trace-cmd.spec index 3c9cce5..8fbc5c6 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -2,11 +2,11 @@ #%%global git_commit trace-cmd-v2.6.2 #%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36 -%global srcversion 3.1.4 +%global srcversion 3.1.6 Name: trace-cmd Version: %{srcversion} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace @@ -21,7 +21,6 @@ Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/t Source1: trace-cmd.conf Source2: trace-cmd.service Source3: 98-trace-cmd.rules -Patch0: trace-cmd-Allow-building-with-GNU-Make-4.4.patch BuildRequires: make BuildRequires: gcc @@ -109,6 +108,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Tue Apr 18 2023 Zamir SUN - 3.1.6-1 +- Update to 3.1.6 + * Fri Mar 31 2023 Jerome Marchand - 3.1.4-3 - Fix build: RHBZ#2171770 - Also remove explicit lib dependency that fedpkg lint complains about. From 78354bc3a4e7e305577570e308f256a56faaff0d Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Mon, 5 Jun 2023 21:51:59 +0800 Subject: [PATCH 14/26] SPDX migration Signed-off-by: Zamir SUN --- trace-cmd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index 8fbc5c6..af1956d 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,8 +6,8 @@ Name: trace-cmd Version: %{srcversion} -Release: 1%{?dist} -License: GPLv2 and LGPLv2 +Release: 2%{?dist} +License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace ExcludeArch: %{ix86} %{arm} @@ -108,6 +108,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Mon Jun 05 2023 Zamir SUN - 3.1.6-2 +- SPDX migration + * Tue Apr 18 2023 Zamir SUN - 3.1.6-1 - Update to 3.1.6 From 9b1912ee9a193368de972930a0e887044b414ecf Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 22 Jun 2023 16:24:23 -0400 Subject: [PATCH 15/26] Remove lingering kernelshark dependencies These build dependencies were used solely for kernelshark, which has since been split out into its own package. --- kernelshark.desktop | 7 ------- trace-cmd.spec | 10 ++++------ 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 kernelshark.desktop diff --git a/kernelshark.desktop b/kernelshark.desktop deleted file mode 100644 index e51a7ab..0000000 --- a/kernelshark.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Kernelshark -Comment=Analyze data output by trace-cmd -Exec=kernelshark -Type=Application -Categories=Development;Profiling; -Icon=applications-development diff --git a/trace-cmd.spec b/trace-cmd.spec index af1956d..5d92dc3 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -28,13 +28,8 @@ BuildRequires: xmlto BuildRequires: asciidoc BuildRequires: mlocate BuildRequires: graphviz doxygen -BuildRequires: libxml2-devel BuildRequires: gcc-c++ -BuildRequires: desktop-file-utils BuildRequires: cmake -BuildRequires: qt5-qtbase-devel -BuildRequires: freeglut-devel -BuildRequires: json-c-devel BuildRequires: libtraceevent-devel >= 1.6.3 BuildRequires: libtracefs-devel >= 1.5.0 BuildRequires: audit-libs-devel @@ -108,6 +103,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Thu Jun 22 2023 Yaakov Selkowitz - 3.1.6-3 +- Remove lingering kernelshark dependencies + * Mon Jun 05 2023 Zamir SUN - 3.1.6-2 - SPDX migration From 57d53f18fa80d4bf3045f7148cee4f8995d7b604 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:39:46 +0000 Subject: [PATCH 16/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- trace-cmd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index 5d92dc3..281fae3 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -103,6 +103,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 22 2023 Yaakov Selkowitz - 3.1.6-3 - Remove lingering kernelshark dependencies From 6ed1c4cc95bfc548881c6c19d782d22dbc364aa9 Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Tue, 23 Jan 2024 22:32:23 +0800 Subject: [PATCH 17/26] Update to 3.2 Signed-off-by: Zamir SUN --- .gitignore | 1 + sources | 2 +- trace-cmd.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 60d8372..a850372 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /trace-cmd-v3.0.3.tar.gz /trace-cmd-v3.1.4.tar.gz /trace-cmd-v3.1.6.tar.gz +/trace-cmd-v3.2.tar.gz diff --git a/sources b/sources index 8731c94..b70e5d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trace-cmd-v3.1.6.tar.gz) = 2504863556a86759173f7114f5ab9a1d5641cefdd2bc9af64d8e5232d175e9c946fbb9dcec00d91b903e74b0e1bc52332877ddc9b705d6cfe2af9cb39797a446 +SHA512 (trace-cmd-v3.2.tar.gz) = 6a8474e619b32ccf60217eba1ce472bdf6e77f6aff118b579f329b49eaf1b20c9a7802b539876be7c782f33dc78587cc510c7b4bf12af5707bfa2813e59ae442 diff --git a/trace-cmd.spec b/trace-cmd.spec index 281fae3..4d4e3bc 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -2,11 +2,11 @@ #%%global git_commit trace-cmd-v2.6.2 #%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36 -%global srcversion 3.1.6 +%global srcversion 3.2 Name: trace-cmd Version: %{srcversion} -Release: 4%{?dist} +Release: 1%{?dist} License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -30,8 +30,8 @@ BuildRequires: mlocate BuildRequires: graphviz doxygen BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: libtraceevent-devel >= 1.6.3 -BuildRequires: libtracefs-devel >= 1.5.0 +BuildRequires: libtraceevent-devel >= 1.8.0 +BuildRequires: libtracefs-devel >= 1.8.0 BuildRequires: audit-libs-devel BuildRequires: chrpath BuildRequires: swig @@ -103,6 +103,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Tue Jan 23 2024 Zamir SUN - 3.2 +- Update to 3.2 (#2213350) + * Sat Jul 22 2023 Fedora Release Engineering - 3.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 787ce0bc732ceaedad3ab33e0f43a10c12337bf9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:38:15 +0000 Subject: [PATCH 18/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- trace-cmd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index 4d4e3bc..3586d6b 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: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -103,6 +103,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 23 2024 Zamir SUN - 3.2 - Update to 3.2 (#2213350) From c7f15f7fa991947dbd3aa2ac821f651973e52407 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 22 May 2024 15:28:34 -0400 Subject: [PATCH 19/26] Drop unused mlocate dependency mlocate has been retired and replaced by plocate for F41, but it does not seem to be used at all. --- trace-cmd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index 3586d6b..67def2c 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -26,7 +26,6 @@ BuildRequires: make BuildRequires: gcc BuildRequires: xmlto BuildRequires: asciidoc -BuildRequires: mlocate BuildRequires: graphviz doxygen BuildRequires: gcc-c++ BuildRequires: cmake From 41fbce047d73663a01ddd99d2d271618eddddced Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 23 Jun 2024 13:10:24 -0400 Subject: [PATCH 20/26] Rebuilt for Python 3.13 --- 0001-python313.patch | 28 ++++++++++++++++++++++++++++ trace-cmd.spec | 8 ++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 0001-python313.patch diff --git a/0001-python313.patch b/0001-python313.patch new file mode 100644 index 0000000..42bf62a --- /dev/null +++ b/0001-python313.patch @@ -0,0 +1,28 @@ +From 2ba15130fae66e19d4d75ab28ef448b0206235c4 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Sun, 23 Jun 2024 13:04:28 -0400 +Subject: [PATCH] trace-cmd library: fix compatibility with Python 3.13 + +PyEval_CallObject was deprecated in Python 3.9 and removed from 3.13. + +Signed-off-by: Yaakov Selkowitz +--- + python/ctracecmd.i | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/ctracecmd.i b/python/ctracecmd.i +index 6d0179e3..8757cbe4 100644 +--- a/python/ctracecmd.i ++++ b/python/ctracecmd.i +@@ -214,7 +214,7 @@ static int python_callback(struct trace_seq *s, + SWIG_NewPointerObj(SWIG_as_voidptr(event), + SWIGTYPE_p_tep_event, 0)); + +- result = PyEval_CallObject(context, arglist); ++ result = PyObject_CallObject(context, arglist); + Py_XDECREF(arglist); + if (result && result != Py_None) { + if (!PyInt_Check(result)) { +-- +2.45.2 + diff --git a/trace-cmd.spec b/trace-cmd.spec index 67def2c..c041f0a 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -21,6 +21,7 @@ Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/t Source1: trace-cmd.conf Source2: trace-cmd.service Source3: 98-trace-cmd.rules +Patch0: 0001-python313.patch BuildRequires: make BuildRequires: gcc @@ -52,7 +53,7 @@ BuildRequires: python3-devel Python plugin support for trace-cmd %prep -%autosetup -n %{name}-v%{srcversion} +%autosetup -n %{name}-v%{srcversion} -p1 cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . @@ -102,6 +103,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Sun Jun 23 2024 Yaakov Selkowitz - 3.2-3 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 80feb9161936f42082c49bcf8ed0bb232c62fff3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:47:05 +0000 Subject: [PATCH 21/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- trace-cmd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index c041f0a..f738999 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -103,6 +103,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 23 2024 Yaakov Selkowitz - 3.2-3 - Rebuilt for Python 3.13 From 30c0df175e54faed577befb27f8fec0f5873a026 Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Thu, 17 Oct 2024 12:58:11 +0800 Subject: [PATCH 22/26] Update to 3.3.1 --- .gitignore | 1 + 0001-python313.patch | 28 ---------------------------- sources | 2 +- trace-cmd.spec | 10 ++++++---- 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 0001-python313.patch diff --git a/.gitignore b/.gitignore index a850372..dcf1bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /trace-cmd-v3.1.4.tar.gz /trace-cmd-v3.1.6.tar.gz /trace-cmd-v3.2.tar.gz +/trace-cmd-v3.3.1.tar.gz diff --git a/0001-python313.patch b/0001-python313.patch deleted file mode 100644 index 42bf62a..0000000 --- a/0001-python313.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2ba15130fae66e19d4d75ab28ef448b0206235c4 Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -Date: Sun, 23 Jun 2024 13:04:28 -0400 -Subject: [PATCH] trace-cmd library: fix compatibility with Python 3.13 - -PyEval_CallObject was deprecated in Python 3.9 and removed from 3.13. - -Signed-off-by: Yaakov Selkowitz ---- - python/ctracecmd.i | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/ctracecmd.i b/python/ctracecmd.i -index 6d0179e3..8757cbe4 100644 ---- a/python/ctracecmd.i -+++ b/python/ctracecmd.i -@@ -214,7 +214,7 @@ static int python_callback(struct trace_seq *s, - SWIG_NewPointerObj(SWIG_as_voidptr(event), - SWIGTYPE_p_tep_event, 0)); - -- result = PyEval_CallObject(context, arglist); -+ result = PyObject_CallObject(context, arglist); - Py_XDECREF(arglist); - if (result && result != Py_None) { - if (!PyInt_Check(result)) { --- -2.45.2 - diff --git a/sources b/sources index b70e5d8..65e4f7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trace-cmd-v3.2.tar.gz) = 6a8474e619b32ccf60217eba1ce472bdf6e77f6aff118b579f329b49eaf1b20c9a7802b539876be7c782f33dc78587cc510c7b4bf12af5707bfa2813e59ae442 +SHA512 (trace-cmd-v3.3.1.tar.gz) = a643efc2868d08871a7359dd0a17389685fb229f26328ee96f27a3dd94b5f3eb62009b945c14725eda1f09fa15367ffe2e2c3611d89860dcc031bbd6403cdee0 diff --git a/trace-cmd.spec b/trace-cmd.spec index f738999..673ba0b 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -2,11 +2,11 @@ #%%global git_commit trace-cmd-v2.6.2 #%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36 -%global srcversion 3.2 +%global srcversion 3.3.1 Name: trace-cmd Version: %{srcversion} -Release: 4%{?dist} +Release: 1%{?dist} License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -21,7 +21,6 @@ Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/t Source1: trace-cmd.conf Source2: trace-cmd.service Source3: 98-trace-cmd.rules -Patch0: 0001-python313.patch BuildRequires: make BuildRequires: gcc @@ -53,7 +52,7 @@ BuildRequires: python3-devel Python plugin support for trace-cmd %prep -%autosetup -n %{name}-v%{srcversion} -p1 +%autosetup -n %{name}-v%{srcversion} cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . @@ -103,6 +102,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Thu Oct 17 2024 Zamir SUN - 3.3.1-1 +- Update to 3.3 + * Sat Jul 20 2024 Fedora Release Engineering - 3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b1ae37db50037ed89585293b3a3f7e32e643edd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:12:14 +0000 Subject: [PATCH 23/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- trace-cmd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index 673ba0b..ad2216d 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: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -102,6 +102,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Oct 17 2024 Zamir SUN - 3.3.1-1 - Update to 3.3 From 5d5457d1901c3d32b32d952453b148a311972a14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:29:26 +0000 Subject: [PATCH 24/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- trace-cmd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index ad2216d..1c48b2c 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -102,6 +102,9 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From dccdf6958cef4db55b19817ae8f56cae25795f53 Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Thu, 14 Aug 2025 15:45:27 +0800 Subject: [PATCH 25/26] tests: Convert gating to TMT Resolves: rhbz#2383087 Signed-off-by: Zamir SUN --- .fmf/version | 1 + tests/README.md | 44 ------------------------------ tests/plan.fmf | 8 ++++++ tests/sanity/Makefile | 59 ----------------------------------------- tests/sanity/sanity.fmf | 3 +++ tests/tests.yml | 11 -------- 6 files changed, 12 insertions(+), 114 deletions(-) create mode 100644 .fmf/version delete mode 100644 tests/README.md create mode 100644 tests/plan.fmf delete mode 100644 tests/sanity/Makefile create mode 100644 tests/sanity/sanity.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/README.md b/tests/README.md deleted file mode 100644 index f37b84e..0000000 --- a/tests/README.md +++ /dev/null @@ -1,44 +0,0 @@ -About - -Trace-cmd tests according to the CI wiki specifically the standard test interface in the [spec](https://fedoraproject.org/wiki/Changes/InvokingTests). - -The playbook includes Tier1 level test cases that have been tested in classic contexts and is passing reliably. - -The following steps are used to execute the tests using the standard test interface: - -Test environment - -Make sure you have installed packages from the spec - - `# dnf install ansible python2-dnf libselinux-python standard-test-roles ansible python2-dnf libselinux-python standard-test-roles` - -Run tests for Classic -~~~~ - # export TEST_SUBJECTS= - # sudo ansible-playbook --tags=classic tests.yml -~~~~ - -Snip of the example test run for Classic tests: - -> TASK [standard-test-beakerlib : Run beakerlib tests] ***************************************************************************************************************************************** -> -> changed: [localhost] => (item=sanity) -> -> TASK [standard-test-beakerlib : Make the master tests summary log artifact] ****************************************************************************************************************** -> -> changed: [localhost] => (item=sanity) -> -> TASK [standard-test-beakerlib : Check the results] ******************************************************************************************************************************************* -> -> changed: [localhost] -> -> TASK [standard-test-beakerlib : include_role] ************************************************************************************************************************************************ -> -> TASK [str-common : Pull out the logs from test environment to test runner] ******************************************************************************************************************* -> -> changed: [localhost] -> -> PLAY RECAP *********************************************************************************************************************************************************************************** -> -> localhost : ok=27 changed=16 unreachable=0 failed=0 -> diff --git a/tests/plan.fmf b/tests/plan.fmf new file mode 100644 index 0000000..f8b2604 --- /dev/null +++ b/tests/plan.fmf @@ -0,0 +1,8 @@ +prepare: + how: install + package: + - trace-cmd +discover: + how: fmf +execute: + how: tmt diff --git a/tests/sanity/Makefile b/tests/sanity/Makefile deleted file mode 100644 index 7af6df1..0000000 --- a/tests/sanity/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Description: Basic sanity test for trace-cmd -# Author: Ziqian SUN (Zamir) -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2018 Red Hat, Inc. All rights reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export PACKAGE_NAME=trace-cmd -export TEST=/kernel/general/ftrace/tools/trace-cmd/upstream -export TESTVERSION=0.1 - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: - chmod a+x runtest.sh - -clean: - rm -fr *~ tests-*.rpm - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Ziqian SUN (Zamir) " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Basic sanity test for trace-cmd" >> $(METADATA) - @echo "TestTime: 30m" >> $(METADATA) - @echo "RunFor: trace-cmd" >> $(METADATA) - @echo "Requires: @development" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv3" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/sanity/sanity.fmf b/tests/sanity/sanity.fmf new file mode 100644 index 0000000..8733518 --- /dev/null +++ b/tests/sanity/sanity.fmf @@ -0,0 +1,3 @@ +test: bash ./runtest.sh +framework: beakerlib +duration: 15m diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index e244be9..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-beakerlib - tests: - - sanity - required_packages: - - kernel - - trace-cmd - From 2f913aa04116a2b1e4da8763ca9f852501901043 Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Fri, 15 Aug 2025 16:09:02 +0800 Subject: [PATCH 26/26] Bump to build and run new gating Reolves: rhbz#2383087 Signed-off-by: Zamir SUN --- trace-cmd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/trace-cmd.spec b/trace-cmd.spec index 1c48b2c..3d7202f 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -6,7 +6,7 @@ Name: trace-cmd Version: %{srcversion} -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later Summary: A user interface to Ftrace @@ -102,6 +102,10 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Fri Aug 15 2025 Zamir SUN - 3.3.1-4 +- Bump to build and run new gating +- Reolves: rhbz#2383087 + * Fri Jul 25 2025 Fedora Release Engineering - 3.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild