From 9f1731cd34b9cb7fc7862511b4933615c4219066 Mon Sep 17 00:00:00 2001
From: shixuantong <shixuantong1@huawei.com>
Date: Fri, 30 May 2025 17:22:08 +0800
Subject: [PATCH] optimize sysSentry dependencies

---
 sysSentry.spec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/sysSentry.spec b/sysSentry.spec
index 20d54c2..b108b5d 100644
--- a/sysSentry.spec
+++ b/sysSentry.spec
@@ -4,7 +4,7 @@
 Summary: System Inspection Framework
 Name: sysSentry
 Version: 1.0.3
-Release: 12
+Release: 13
 License: Mulan PSL v2
 Group: System Environment/Daemons
 Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -30,7 +30,6 @@ BuildRequires: elfutils-devel clang libbpf-devel bpftool
 BuildRequires: python3-numpy python3-pytest
 
 Requires:      pyxalarm = %{version}
-Requires:      libbpf
 
 %define PYTHON_VERSION %{python3_version}
 %define PKGVER syssentry-%{version}-py%{PYTHON_VERSION}.egg-info
@@ -91,6 +90,7 @@ This package provides Supports xalarm report for plugins
 %package -n pysentry_collect
 Summary:        Supports collect in python immplementation
 Requires:       sysSentry = %{version}-%{release}
+Requires:       libbpf
 
 %description -n pysentry_collect
 This package provides Supports collect for plugins
@@ -150,7 +150,6 @@ rm -rf /var/run/sysSentry | :
 # sysSentry
 %attr(0500,root,root) %{_bindir}/sentryctl
 %attr(0550,root,root) %{_bindir}/syssentry
-%attr(0550,root,root) %{_bindir}/ebpf_collector
 %attr(0750,root,root) %config(noreplace) %{_var}/log/sysSentry
 %attr(0750,root,root) %config(noreplace) %{_sysconfdir}/sysSentry/tasks
 %attr(0750,root,root) %config(noreplace) %{_sysconfdir}/sysSentry/plugins
@@ -159,7 +158,10 @@ rm -rf /var/run/sysSentry | :
 %attr(0550,root,root) %{_libdir}/libsentry_log.so
 %exclude %{_includedir}/libsentry/log_utils.h
 
+# pysentry_collect
+%exclude %{_bindir}/ebpf_collector
 %exclude %{python3_sitelib}/sentryCollector/collect_plugin.py
+
 %exclude %{python3_sitelib}/xalarm/register_xalarm.py
 %exclude %{python3_sitelib}/xalarm/sentry_notify.py
 
@@ -224,6 +226,7 @@ rm -rf /var/run/sysSentry | :
 
 %files -n pysentry_collect
 %attr(0550,root,root) %{python3_sitelib}/sentryCollector/collect_plugin.py
+%attr(0550,root,root) %{_bindir}/ebpf_collector
 
 %files -n hbm_online_repair
 %attr(0550,root,root) %{_bindir}/hbm_online_repair
@@ -237,6 +240,12 @@ rm -rf /var/run/sysSentry | :
 %attr(0600,root,root) %{_sysconfdir}/sysSentry/tasks/sentry_msg_monitor.mod
 
 %changelog
+* Fri May 30 2025 shixuantong <shixuantong1@huawei.com> - 1.0.3-13
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:optimize sysSentry dependencies
+
 * Fri Mar 14 2025 luckky <guodashun1@huawei.com> - 1.0.3-12
 - Type:feature
 - CVE:NA
-- 
Gitee