!11 【LTS升级】systemtap升级到最新版本

Merge pull request !11 from xinghe/openEuler-20.03-LTS

huawei-fix-network-tcp-test-error.patch

@@ -1,63 +0,0 @@
-From 5d0424e51857d5f706e78d6d962f380fa70f49f0 Mon Sep 17 00:00:00 2001
-From: langfei <langfei@huawei.com>
-Date: Wed, 5 Jul 2023 10:27:11 +0800
-Subject: [PATCH] fix network tcp test error
-
-Signed-off-by: langfei <langfei@huawei.com>
----
- tapset/linux/ipmib.stp                             | 4 ++--
- tapset/linux/linuxmib.stp                          | 2 +-
- testsuite/systemtap.examples/network/tcp_trace.stp | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tapset/linux/ipmib.stp b/tapset/linux/ipmib.stp
-index 6f51dfd..603c5d4 100644
---- a/tapset/linux/ipmib.stp
-+++ b/tapset/linux/ipmib.stp
-@@ -271,7 +271,7 @@ probe ipmib.InAddrErrors=kernel.function("ip_route_input_noref").return!,
-  * IPSTATS_MIB_INUNKNOWNPROTOS)
-  */
- /* icmp_send() is called by ip_local_deliver_finish() */
--probe ipmib.InUnknownProtos=kernel.function("icmp_send")
-+probe ipmib.InUnknownProtos=kernel.function("__icmp_send")
- {
- 	skb = $skb_in;
- 	op = 1;
-@@ -360,7 +360,7 @@ probe ipmib.OutRequests=kernel.function("ip_output"),
-  * counted in the global @ReasmTimeout (equivalent to SNMP's MIB
-  * IPSTATS_MIB_REASMTIMEOUT)
-  */
--probe ipmib.ReasmTimeout=kernel.function("icmp_send")
-+probe ipmib.ReasmTimeout=kernel.function("__icmp_send")
- {
- 	skb = $skb_in;
- 	op = 0;
-diff --git a/tapset/linux/linuxmib.stp b/tapset/linux/linuxmib.stp
-index 63ec248..cb92875 100644
---- a/tapset/linux/linuxmib.stp
-+++ b/tapset/linux/linuxmib.stp
-@@ -30,7 +30,7 @@ probe linuxmib.DelayedACKs = _linuxmib.DelayedACKs.* {}
- 
- probe _linuxmib.DelayedACKs.A = kernel.function("tcp_send_ack")
- {
--	sk=$sk
-+	sk=pointer_arg(1)
- 	if ( !indelack_timer[sk] ) next
- 	op=1
- 	key = linuxmib_filter_key(sk,op);
-diff --git a/testsuite/systemtap.examples/network/tcp_trace.stp b/testsuite/systemtap.examples/network/tcp_trace.stp
-index 65a32f2..98c77c0 100755
---- a/testsuite/systemtap.examples/network/tcp_trace.stp
-+++ b/testsuite/systemtap.examples/network/tcp_trace.stp
-@@ -192,7 +192,7 @@ probe kernel.{function("tcp_rcv_established"),
- 	}
- }
- 
--probe kernel.function("tcp_transmit_skb")
-+probe kernel.function("__tcp_transmit_skb")
- {
- 	sk = $sk
- 	key = filter_key(sk)
--- 
-2.33.0
-

huawei-local-is-only-valid-in-functions-for-shellche-sc2168.patch

@@ -1,26 +0,0 @@
-From cea3c6a744e5f0d2017e5cc11033b8d226b482f9 Mon Sep 17 00:00:00 2001
-From: langfei <langfei@huawei.com>
-Date: Wed, 5 Jul 2023 10:45:23 +0800
-Subject: [PATCH] local is only valid in functions for shellcheck sc2168
-
-Signed-off-by: langfei <langfei@huawei.com>
----
- doc/Tapset_Reference_Guide/publicanize.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/Tapset_Reference_Guide/publicanize.sh b/doc/Tapset_Reference_Guide/publicanize.sh
-index 330409e..97254fe 100755
---- a/doc/Tapset_Reference_Guide/publicanize.sh
-+++ b/doc/Tapset_Reference_Guide/publicanize.sh
-@@ -22,7 +22,7 @@ do
- 	val=`printf %s $1 | awk -F= '{print $2}'`
- 	shift
- 	if test -z "$val"; then
--		local possibleval=$1
-+		possibleval=$1
- 		printf %s $1 "$possibleval" | grep ^- >/dev/null 2>&1
- 		if test "$?" != "0"; then
- 			val=$possibleval
--- 
-2.33.0
-

systemtap-4.1-vs-4.3.yaml

@@ -1,33 +0,0 @@
-name: systemtap
-old_version: 4.1
-new_version: 4.3
-interface_differences:
-- type: 'feature'
-  item: 支持eBPF功能
-  diff: 新增
-  influence: 支持prometheus导出器、procfs探针等eBPF功能
-- type: 'feature'
-  item: 同名probe解析功能
-  diff: 新增
-  influence: 支持用不同的PC地址去区分多个同名的probe
-- type: 'feature'
-  item: 后端执行器支持try-catch捕获异常
-  diff: 新增
-  influence: 不影响
-- type: 'ABI'
-  item: 新增gettimeofday()
-  diff: 返回当前的时间
-  influence: 不影响
-- type: 'ABI'
-  item: 新增dump_stack()
-  diff: 打印内核调用栈
-  influence: 不影响
-- type: 'ABI'
-  item: gettimeofday_*
-  diff: 返回当前的时间
-  influence: 不影响
-- type: 'CLI'
-  item: 加强对$variable变量类型的检查
-  diff: 可能在解析和编译的时候输出更多的告警信息
-  influence: 尽可能的修正这些告警信息，虽然不会影响最终的执行结果
-remark: '功能增强，无影响;'

systemtap.spec

@@ -21,23 +21,19 @@
 %undefine __brp_mangle_shebangs
 
 Name: systemtap
-Version: 5.2
+Version: 4.3
 Release: 1
 Summary: Linux trace and probe tool
 License: GPLv2+ and Public Domain
 URL: http://sourceware.org/systemtap
 Source: https://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz
 
-Patch9000: huawei-fix-network-tcp-test-error.patch
-Patch9001: huawei-local-is-only-valid-in-functions-for-shellche-sc2168.patch
-Patch9002: Add-basic-LoongArch64-support.patch
-
 BuildRequires: gcc-c++ emacs systemd python3-setuptools
 BuildRequires: gettext-devel rpm-devel readline-devel
 BuildRequires: pkgconfig(nss) pkgconfig(avahi-client)
 BuildRequires: pkgconfig(ncurses) pkgconfig(json-c)
 BuildRequires: jpackage-utils python3-devel
-BuildRequires: elfutils-devel >= 0.142 elfutils-debuginfod-client elfutils-debuginfod-client-devel
+BuildRequires: elfutils-devel >= 0.142
 BuildRequires: sqlite-devel > 3.7
 %if %{with_dyninst}
 BuildRequires: dyninst-devel >= 8.0
@@ -48,6 +44,7 @@ BuildRequires: crash-devel zlib-devel
 %endif
 
 Requires: systemtap-client = %{version}-%{release}
+Requires: systemtap-devel = %{version}-%{release}
 
 %description
 SystemTap is an instrumentation system for systems running Linux.
@@ -58,7 +55,7 @@ the components needed to locally develop and execute systemtap scripts.
 %package devel
 Summary: Programmable system-wide instrumentation system - development headers, tools
 License: GPLv2+
-Requires: make kernel-devel systemd
+Requires: gcc make kernel-devel systemd
 
 %description devel
 This package contains the components needed to compile a systemtap
@@ -133,7 +130,6 @@ Requires: dejagnu which elfutils grep nc
 Requires: gcc gcc-c++ make glibc-devel
 Requires: strace nc avahi perf
 Requires: systemtap-runtime-python3 = %{version}-%{release}
-Requires: elfutils-debuginfod
 %if %{with_crash}
 Requires: crash
 %endif
@@ -164,17 +160,6 @@ This package includes files for a systemd service that manages
 systemtap sessions and relays prometheus metrics from the sessions
 to remote requesters on demand.
 
-%package jupyter
-Summary: ISystemtap jupyter kernel and examples
-License: GPLv2+
-URL: http://sourceware.org/systemtap/
-Requires: systemtap = %{version}-%{release}
-
-%description jupyter
-This package includes files needed to build and run
-the interactive systemtap Jupyter kernel, either locally
-or within a container.
-
 %package help
 Summary: systemtap manual
 License: GPLv2+
@@ -184,7 +169,7 @@ URL: http://sourceware.org/systemtap
 This package include systemtap manual
 
 %prep
-%autosetup -p1
+%setup -q %{?setup_elfutils}
 
 %build
 %configure \
@@ -276,10 +261,6 @@ install -m 644 stap-exporter/stap-exporter.8* $RPM_BUILD_ROOT%{_mandir}/man8
 getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr
 getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys
 getent group stapdev >/dev/null || groupadd -g 158 -r stapdev 2>/dev/null || groupadd -r stapdev
-getent group stapunpriv >/dev/null || groupadd -g 159 -r stapunpriv 2>/dev/null || groupadd -r stapunpriv
-getent passwd stapunpriv >/dev/null || \
-  useradd -c "Systemtap Unprivileged User" -u 159 -g stapunpriv -d %{_localstatedir}/lib/stapunpriv -r -s /sbin/nologin stapunpriv 2>/dev/null || \
-  useradd -c "Systemtap Unprivileged User" -g stapunpriv -d %{_localstatedir}/lib/stapunpriv -r -s /sbin/nologin stapunpriv
 exit 0
 
 %pre server
@@ -344,11 +325,8 @@ fi
 exit 0
 
 %preun stap-exporter
-if [ "$1" -eq "0" ] ; then
 /bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || :
 /bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || :
-fi
-exit 0
 
 %post
 /bin/systemctl enable systemtap.service >/dev/null 2>&1 || :
@@ -404,7 +382,6 @@ exit 0
 %files devel -f systemtap.lang
 %{_bindir}/stap
 %{_bindir}/stap-prep
-%{_bindir}/stap-profile-annotate
 %{_bindir}/stap-report
 %dir %{_datadir}/systemtap
 %{_datadir}/systemtap/runtime
@@ -471,88 +448,18 @@ exit 0
 /usr/sbin/stap-exporter
 /etc/sysconfig/stap-exporter
 
-%files jupyter
-%{_bindir}/stap-jupyter-container
-%{_bindir}/stap-jupyter-install
-%{_mandir}/man1/stap-jupyter.1*
-%dir %{_datadir}/systemtap
-%{_datadir}/systemtap/interactive-notebook
-
 %files help
 %{_mandir}/man[1378]/*
 
 %changelog
-* Thu Dec 05 2024 wangxiao <wangxiao184@h-partners.com> - 5.2-1
-- Upgrade to 5.2
+* Wed Aug 26 2020 xinghe <xinghe1@huawei.com> - 4.3-1
+- update to 4.3
 
-* Wed Sep 04 2024 wangxiao <wangxiao184@h-partners.com> - 5.0-3
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC:Make stp_task_work compatible with 6.11 kernels
+* Tue Aug 18 2020 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 4.1.5
+- rebuild for requirement package update
 
-* Fri Jul 05 2024 wangqiang <wangqiang1@kylinos.cn> - 5.0-2
-- Type:update
-- CVE:NA
-- SUG:NA
-- DESC:Add basic loongarch64 support
-
-* Wed Jan 24 2024 liuchao <liuchao173@huawei.com> - 5.0-1
-- Upgrade to 5.0:
-  - Performance improvements in uprobe registration and module startup.
-  - More probe point process details are printed in "-L" list mode with more "-v".
-  - For the case where newer kernels may break systemtap runtime APIs, better pass-4 failure diagnostics are printed.
-  - Tapset function print_ubacktrace_fileline() now understands DWARF5.
-  - The target(s) of process probes may be specified by path name globs,  as located selected debuginfod servers.
-  - The kernel-user message transport system added framing codes, making the transport more reliable, but becoming incompatible across pre-5.0 versions. Use matching versions of stap and staprun.
-  - The testsuite Makefile has been simplified to remove concurrency, so "parallel" and "resume" modes are gone.
-  - New runtime macro STP_TIMING_NSECS is now supported for reporting probe timing stats in nsecs instead of cycles.  This may become default later.
-  - Add new runtime macro STP_FORCE_STDOUT_TTY to override STP_STDOUT_NOT_ATTY.
-
-* Wed Sep 6 2023 langfei<langfei@huawei.com> - 4.9-1
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC:Upgrade to 4.9
-
-* Tue Aug 8 2023 langfei<langfei@huawei.com> - 4.5-7
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC:Adapts to gcc 12 and python 3.11
-
-* Wed Jul 5 2023 langfei<langfei@huawei.com> - 4.5-6
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC:Fix some test cases fail to be executed, Resolve the sc2168 warning detected by the shellcheck tool.
-
-* Mon Feb 6 2023 langfei<langfei@huawei.com> - 4.5-5
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC:Solve systemtap build problem in openEuler:MultiLanguage
-
-* Mon Dec 5 2022 langfei<langfei@huawei.com> - 4.5-4
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC:Resolve stap-exporter.service chenge to disable when upgraded systemtap-stap-exporter package
-
-* Fri Apr 8 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 4.5-3
-- Add int type cast to resolve gcc issue for option Wformat=2
-
-* Tue Feb 15 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 4.5-2
-- Remove requires on gcc and systemtap-devel
-
-* Thu Dec 2 2021 zhouwenpei <zhouwenpei1@huawei.com> - 4.5-1
-- upgrade to 4.5
-
-* Mon Feb 1 2021 xinghe <xinghe1@huawei.com> - 4.4-1
-- upgrade to 4.4
-
-* Tue Jul 21 2020 jinzhimin <jinzhimin2@huawei.com> - 4.3-1
-- upgrade to 4.3
+* Mon May 18 2020 yuxiangyang <yuxiangyang4@huawei.com> - 4.1.4
+- rebuild for dyninst update
 
 * Fri Mar 13 2020 yuxiangyang <yuxiangyang4@huawei.com> - 4.1.3
 - remove java-runtime

systemtap.yaml

@@ -1,4 +0,0 @@
-version_control: git
-src_repo: https://sourceware.org/git/systemtap.git
-tag_prefix: ^release-
-seperator: .