Compare commits

..

10 Commits

Author SHA1 Message Date
asphyxiasq
07c39c25ef fix xdiag ntrace error
(cherry picked from commit 3b14f45b65e4f9c2389b4fb59f9cb3a2373c37d2)
2024-06-17 17:21:52 +08:00
asphyxiasq
5009c73fd6 fix xd_iolatency no return 2024-05-29 14:46:04 +08:00
openeuler-ci-bot
bd15534d07
!40 xdiagnosis fix bpf error in linux 6.6
From: @junze-yu 
Reviewed-by: @fwking 
Signed-off-by: @fwking
2024-04-23 14:47:19 +00:00
Junze Yu
4015b325a7 fix bpf error in linux 6.6 2024-04-23 22:11:32 +08:00
openeuler-ci-bot
a4e5894dc8
!38 [sync] PR-37: rebase
From: @openeuler-sync-bot 
Reviewed-by: @snoweay 
Signed-off-by: @snoweay
2024-04-17 09:35:01 +00:00
asphyxiasq
4cfb66023d rebase
(cherry picked from commit 37ef1008ce121faa3463a6ce3a3bc27c2b0029b1)
2024-04-17 17:16:13 +08:00
openeuler-ci-bot
8c6ae5a556
!15 add dwarves for buildrequires
From: @ly_wys 
Reviewed-by: @snoweay 
Signed-off-by: @snoweay
2023-02-02 03:16:45 +00:00
qiangxiaojun
425dabf731 add dwarves for buildrequires 2023-02-02 10:27:06 +08:00
openeuler-ci-bot
e84094c48e
!14 add buildrequires of bpftool and kernel-debuginfo
From: @ly_wys 
Reviewed-by: @snoweay 
Signed-off-by: @snoweay
2023-02-01 01:51:48 +00:00
qiangxiaojun
50d7c1a475 add buildrequires of bpftool and kernel-debuginfo 2023-01-31 20:22:12 +08:00
2 changed files with 32 additions and 8 deletions

Binary file not shown.

View File

@ -2,7 +2,7 @@
Name: xdiagnose
Version: 1.0.1
Release: 1
Release: 7
Summary: system diagnostic tool set
License: MulanPSL-2.0
@ -10,8 +10,9 @@ URL: https://gitee.com/openeuler/X-diagnosis
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: python3 python3-setuptools
BuildRequires: elfutils-devel clang llvm libbpf libbpf-devel libbpf-static
BuildRequires: python3 python3-setuptools
BuildRequires: elfutils-devel clang llvm libbpf libbpf-devel libbpf-static bpftool dwarves cmake
BuildRequires: kernel-debuginfo gdb
%description
Xdiagnose is an OS troubleshooting tool that integrates functions such as analysis, network tracking, periodic information recording, and historical experience curing.
@ -20,26 +21,49 @@ Xdiagnose is an OS troubleshooting tool that integrates functions such as analys
%setup -n %{name}-%{version}
%build
pushd src/python
python3 setup.py build
sh xdiag_ebpf/build.sh -b
popd
sh build/build.sh -b %{buildroot}/%{_bindir}
%install
pushd src/python
python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
sh xdiag_ebpf/build.sh -i %{buildroot}/%{_bindir}
popd
sh build/build.sh -i %{buildroot}/%{_bindir}
mkdir -p %{buildroot}%{_sysconfdir}/x-diagnose
cp -a diag.conf %{buildroot}%{_sysconfdir}/x-diagnose
cp -a xdiag_sh/sysinspect/sysinspect %{buildroot}%{_bindir}/xd_sysinspect
cp -a config/diag.conf %{buildroot}%{_sysconfdir}/x-diagnose
cp -a config/sysinspect.conf %{buildroot}%{_sysconfdir}/x-diagnose
%clean
rm -rf $RPM_BUILD_ROOT
%files -f INSTALLED_FILES
%files -f src/python/INSTALLED_FILES
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/x-diagnose/diag.conf
%config(noreplace) %{_sysconfdir}/x-diagnose/sysinspect.conf
%{_bindir}/*
%changelog
* Mon Jun 17 2024 zhanpengxu<zhanpengxu@huawei.com> - 1.0.1-7
- fix xdiag ntrace error
* Wed May 29 2024 zhanpengxu<zhanpengxu@huawei.com> - 1.0.1-6
- fix xd_iolatency no return
* Tue Apr 23 2024 yujunze<yujunze2@huawei.com> - 1.0.1-5
- fix bpf error in linux 6.6
* Sun June 25 2023 wangxiaogang<wangxiaogang3@huawei.com> - 1.0.1-4
- fix param error
* Wed June 12 2023 wangxiaogang<wangxiaogang3@huawei.com> - 1.0.1-3
- fix python pack error
* Wed June 7 2023 wangxiaogang<wangxiaogang3@huawei.com> - 1.0.1-2
- new framework
* Fri Dec 2 2022 lankstra<lankstra@163.com> - 1.0.1-1
- init version.