xdiagnose.spec

@@ -2,7 +2,7 @@
 
 Name:		xdiagnose
 Version:	1.0.1
-Release:	7
+Release:	1
 Summary:	system diagnostic tool set
 
 License:	MulanPSL-2.0
@@ -10,9 +10,8 @@ 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 bpftool dwarves cmake
-BuildRequires:  kernel-debuginfo gdb
+BuildRequires:  python3 python3-setuptools
+BuildRequires:	elfutils-devel clang llvm libbpf libbpf-devel libbpf-static
 
 %description
 Xdiagnose is an OS troubleshooting tool that integrates functions such as analysis, network tracking, periodic information recording, and historical experience curing.
@@ -21,49 +20,26 @@ Xdiagnose is an OS troubleshooting tool that integrates functions such as analys
 %setup -n %{name}-%{version}
 
 %build
-pushd src/python
 python3 setup.py build
-popd
-sh build/build.sh -b %{buildroot}/%{_bindir}
+sh xdiag_ebpf/build.sh -b
 
 %install
-pushd src/python
 python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
-popd
-sh build/build.sh -i %{buildroot}/%{_bindir}
+sh xdiag_ebpf/build.sh -i %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}%{_sysconfdir}/x-diagnose
-cp -a config/diag.conf %{buildroot}%{_sysconfdir}/x-diagnose
-cp -a config/sysinspect.conf %{buildroot}%{_sysconfdir}/x-diagnose
+cp -a diag.conf %{buildroot}%{_sysconfdir}/x-diagnose
+cp -a xdiag_sh/sysinspect/sysinspect %{buildroot}%{_bindir}/xd_sysinspect
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f src/python/INSTALLED_FILES
+%files -f 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.