From 51c31b7cb021c38d9417784010361a7bc5b648a9 Mon Sep 17 00:00:00 2001 From: Bo Ren Date: Tue, 25 Mar 2025 16:08:59 +0800 Subject: [PATCH] Breaks up the sdt.h header file and the /usr/bin/dtrace stub-builder script Signed-off-by: Bo Ren --- systemtap.spec | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index c6fb1b0..77c7a24 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %bcond_without rpm %bcond_without bpf %bcond_without crash @@ -90,7 +90,8 @@ Release: %{anolis_release}%{?release_override}%{?dist} # systemtap-client /usr/bin/stap, samples, docs, tapset(bonus), req:-runtime # systemtap-server /usr/bin/stap-server*, req:-devel # systemtap-runtime /usr/bin/staprun, /usr/bin/stapsh, /usr/bin/stapdyn -# systemtap-sdt-devel /usr/include/sys/sdt.h /usr/bin/dtrace +# systemtap-sdt-devel /usr/include/sys/sdt.h +# systemtap-sdt-dtrace /usr/bin/dtrace # systemtap-testsuite /usr/share/systemtap/testsuite*, req:systemtap, req:sdt-devel # systemtap-initscript /etc/init.d/systemtap, dracut module, req:systemtap # systemtap-runtime-java libHelperSDT.so, HelperSDT.jar, stapbm, req:-runtime @@ -111,7 +112,7 @@ Release: %{anolis_release}%{?release_override}%{?dist} # intermediary stap-server for --use-server: systemtap-server (-devel unused) Summary: Programmable system-wide instrumentation system -License: GPLv2+ +License: GPL-2.0-or-later URL: http://sourceware.org/systemtap/ Source: https://sourceware.org/ftp/systemtap/releases/%{name}-%{version}.tar.gz Patch001: 0001-add-loongarch64-support-for-systemtap.patch @@ -377,8 +378,8 @@ boot-time probing if supported. %package sdt-devel -Summary: Static probe support tools -License: GPLv2+ and Public Domain +Summary: Static probe support header files +License: GPL-2.0-or-later AND CC0-1.0 URL: http://sourceware.org/systemtap/ %if %{with pyparsing} %if %{with python3} @@ -390,9 +391,25 @@ Requires: pyparsing %description sdt-devel This package includes the header file used for static -instrumentation compiled into userspace programs and libraries, along -with the optional dtrace-compatibility preprocessor to process related -.d files into tracing-macro-laden .h headers. +instrumentation compiled into userspace programs. + +# https://inbox.sourceware.org/systemtap/Zy640M7FbVZf-lwz@elastic.org/T/#u +%package sdt-dtrace +Summary: Static probe support dtrace tool +License: GPL-2.0-or-later AND CC0-1.0 +URL: https://sourceware.org/systemtap/ +Provides: dtrace = %{version}-%{release} +%if %{with_pyparsing} +%if %{with_python3} +Requires: python3-pyparsing +%else +Requires: pyparsing +%endif +%endif + +%description sdt-dtrace +This package includes the dtrace-compatibility preprocessor +to process related .d files into tracing-macro-laden .h headers. %package testsuite Summary: Instrumentation System Testsuite @@ -1176,14 +1193,19 @@ exit 0 %files sdt-devel %license COPYING -%{_bindir}/dtrace %{_includedir}/sys/sdt.h -%{_mandir}/man1/dtrace.1* -%doc README AUTHORS NEWS %{_includedir}/sys/sdt-config.h %{_rpmmacrodir}/macros.systemtap %{!?_licensedir:%global license %%doc} +%files sdt-dtrace +%{_bindir}/dtrace +%doc README AUTHORS NEWS +%{!?_licensedir:%global license %%doc} +%license COPYING +%{_mandir}/man1/dtrace.1* + + %if %{with virtguest} %files runtime-virtguest %if %{with systemd} @@ -1251,6 +1273,9 @@ exit 0 # ------------------------------------------------------------------------ %changelog +* Tue Mar 25 2025 Bo Ren - 5.2-2 +- Breaks up the sdt.h header file and the /usr/bin/dtrace stub-builder script + * Thu Mar 20 2025 Weisson - 5.2-1 - Update to 5.2 from 4.8 - add jupyter kernel and examples in jupyter package from 4.9 ( -- Gitee