diff --git a/add-service-dependency.patch b/add-service-dependency.patch new file mode 100644 index 0000000000000000000000000000000000000000..22405ae9863cb059ee5a9ffa92d6bc20b8700c0f --- /dev/null +++ b/add-service-dependency.patch @@ -0,0 +1,35 @@ +From a484de76115cbd05e418fb1f198bbf9a6810665b Mon Sep 17 00:00:00 2001 +From: zhangnan +Date: Thu, 24 Oct 2024 21:53:43 +0800 +Subject: [PATCH] add service dependency + +--- + service/sentryCollector.service | 1 + + service/sysSentry.service | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/service/sentryCollector.service b/service/sentryCollector.service +index e09ddb3..3bb08af 100644 +--- a/service/sentryCollector.service ++++ b/service/sentryCollector.service +@@ -1,5 +1,6 @@ + [Unit] + Description = Collection module added for sysSentry ++Requires=sysSentry.service + + [Service] + ExecStart=/usr/bin/python3 /usr/bin/sentryCollector +diff --git a/service/sysSentry.service b/service/sysSentry.service +index 1d8338f..9811e6c 100644 +--- a/service/sysSentry.service ++++ b/service/sysSentry.service +@@ -1,5 +1,6 @@ + [Unit] + Description=EulerOS System Inspection Frame ++Requires=xalarmd.service + + [Service] + ExecStart=/usr/bin/python3 /usr/bin/syssentry +-- +2.33.0 + diff --git a/sysSentry.spec b/sysSentry.spec index 1f384917e91544956591009fffb50b74d15d0d24..f3bdff6b66fa907f2abf00ca39fd9bb5f9b07997 100644 --- a/sysSentry.spec +++ b/sysSentry.spec @@ -4,7 +4,7 @@ Summary: System Inspection Framework Name: sysSentry Version: 1.0.2 -Release: 58 +Release: 59 License: Mulan PSL v2 Group: System Environment/Daemons Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -75,12 +75,13 @@ Patch62: fix-frequency-param-check-bug.patch Patch63: ai_block_io-support-iodump.patch Patch64: fix-get_alarm-error.patch Patch65: ai_block_io-support-absolute-threshold-lower-limit.patch +Patch66: add-service-dependency.patch BuildRequires: cmake gcc-c++ BuildRequires: python3 python3-setuptools BuildRequires: json-c-devel BuildRequires: chrpath -BuildRequires: elfutils-devel clang libbpf-devel llvm kernel-source +BuildRequires: elfutils-devel clang libbpf-devel llvm kernel-source kernel-devel Requires: libxalarm = %{version} Requires: libbpf Requires: pyxalarm = %{version} @@ -347,6 +348,12 @@ rm -rf %{buildroot} %attr(0550,root,root) %{python3_sitelib}/sentryCollector/__pycache__/collect_plugin* %changelog +* Thu Oct 24 2024 zhangnan - 1.0.2-59 +- Type:bugfix +- CVE:NA +- SUG:NA +- DES:add service dependency and add ebpf buildrequirement + * Thu Oct 24 2024 heyouzhi - 1.0.2-58 - Type:bugfix - CVE:NA