diff --git a/xdiagnose-1.0.1.tar.gz b/xdiagnose-1.0.1.tar.gz index 80bf8a8..a30d58a 100644 Binary files a/xdiagnose-1.0.1.tar.gz and b/xdiagnose-1.0.1.tar.gz differ diff --git a/xdiagnose.spec b/xdiagnose.spec index 2c5374d..46163dc 100644 --- a/xdiagnose.spec +++ b/xdiagnose.spec @@ -2,7 +2,7 @@ Name: xdiagnose Version: 1.0.1 -Release: 1 +Release: 2 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 +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,15 +21,16 @@ Xdiagnose is an OS troubleshooting tool that integrates functions such as analys %setup -n %{name}-%{version} %build -python3 setup.py build -sh xdiag_ebpf/build.sh -b +python3 src/python/setup.py build + +sh build/build.sh -b %{buildroot}/%{_bindir} %install -python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES -sh xdiag_ebpf/build.sh -i %{buildroot}/%{_bindir} +python3 src/python/setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES +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 @@ -37,9 +39,12 @@ rm -rf $RPM_BUILD_ROOT %files -f INSTALLED_FILES %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/x-diagnose/diag.conf +%config(noreplace) %{_sysconfdir}/x-diagnose/sysinspect.conf %{_bindir}/* %changelog +* Wed June 7 2023 wangxiaogang - 1.0.1-2 +- new framework * Fri Dec 2 2022 lankstra - 1.0.1-1 - init version.