!38 [sync] PR-37: rebase

From: @openeuler-sync-bot 
Reviewed-by: @snoweay 
Signed-off-by: @snoweay
This commit is contained in:
openeuler-ci-bot 2024-04-17 09:35:01 +00:00 committed by Gitee
commit a4e5894dc8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 24 additions and 11 deletions

Binary file not shown.

View File

@ -2,7 +2,7 @@
Name: xdiagnose Name: xdiagnose
Version: 1.0.1 Version: 1.0.1
Release: 1 Release: 4
Summary: system diagnostic tool set Summary: system diagnostic tool set
License: MulanPSL-2.0 License: MulanPSL-2.0
@ -10,38 +10,51 @@ URL: https://gitee.com/openeuler/X-diagnosis
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: python3 python3-setuptools BuildRequires: python3 python3-setuptools
BuildRequires: elfutils-devel clang llvm libbpf libbpf-devel libbpf-static bpftool dwarves BuildRequires: elfutils-devel clang llvm libbpf libbpf-devel libbpf-static bpftool dwarves cmake
BuildRequires: kernel-debuginfo BuildRequires: kernel-debuginfo gdb
%description %description
Xdiagnose is an OS troubleshooting tool that integrates functions: Xdiagnose is an OS troubleshooting tool that integrates functions such as analysis, network tracking, periodic information recording, and historical experience curing.
such as analysis, network tracking, periodic information recording, and historical experience curing.
%prep %prep
%setup -n %{name}-%{version} %setup -n %{name}-%{version}
%build %build
pushd src/python
python3 setup.py build python3 setup.py build
sh xdiag_ebpf/build.sh -b popd
sh build/build.sh -b %{buildroot}/%{_bindir}
%install %install
pushd src/python
python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES 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 mkdir -p %{buildroot}%{_sysconfdir}/x-diagnose
cp -a diag.conf %{buildroot}%{_sysconfdir}/x-diagnose cp -a config/diag.conf %{buildroot}%{_sysconfdir}/x-diagnose
cp -a xdiag_sh/sysinspect/sysinspect %{buildroot}%{_bindir}/xd_sysinspect cp -a config/sysinspect.conf %{buildroot}%{_sysconfdir}/x-diagnose
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files -f INSTALLED_FILES %files -f src/python/INSTALLED_FILES
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/x-diagnose/diag.conf %config(noreplace) %{_sysconfdir}/x-diagnose/diag.conf
%config(noreplace) %{_sysconfdir}/x-diagnose/sysinspect.conf
%{_bindir}/* %{_bindir}/*
%changelog %changelog
* 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 * Fri Dec 2 2022 lankstra<lankstra@163.com> - 1.0.1-1
- init version. - init version.