fix delete monitor.service

Signed-off-by: wuyifeng <wuyifeng10@huawei.com>
(cherry picked from commit 1c0adc89486fd32574ab3c0154cca027b7a92f86)
This commit is contained in:
wuyifeng 2024-04-08 17:48:01 +08:00 committed by openeuler-sync-bot
parent 749e46bd2e
commit a7f53337ab
2 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,15 @@
diff --git a/cxl/meson.build b/cxl/meson.build
index 61b4d87..9792158 100644
--- a/cxl/meson.build
+++ b/cxl/meson.build
@@ -12,8 +12,10 @@ cxl_src = [
]
if get_option('systemd').enabled()
+if get_option('libtracefs').enabled()
install_data('cxl-monitor.service', install_dir : systemdunitdir)
endif
+endif
deps = [
cxl_dep,

View File

@ -1,6 +1,6 @@
Name: ndctl
Version: 78
Release: 1
Release: 2
Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory)
License: GPL-2 AND LGPL-2.1 AND MIT AND CC0-1.0
Group: System Environment/Base
@ -8,6 +8,7 @@ Url: https://github.com/pmem/ndctl
Source0: https://github.com/pmem/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch1: 0001-zero_info_block-skip-seed-devices.patch
Patch2: 0002-exclude-cxl_monitor_service.patch
Requires: ndctl-libs%{?_isa} = %{version}-%{release}
Requires: daxctl-libs%{?_isa} = %{version}-%{release}
@ -205,7 +206,7 @@ fi
%{_bindir}/cxl
%{_mandir}/man1/cxl*
%{bashcompdir}/cxl
%{_unitdir}/cxl-monitor.service
%exclude %{_unitdir}/cxl-monitor.service
%files -n ndctl-libs
%doc README.md
@ -243,6 +244,9 @@ fi
%{_mandir}/man3/libcxl.3*
%changelog
* Mon Apr 8 2024 wuyifeng <wuyifeng10@huawei.com> - 78-2
- fix ndctl delete monitor.service
* Wed Jan 17 2024 wuyifeng <wuyifeng10@huawei.com> - 78-1
- upgrade to version 78:
-incorporate up to 6.5 kernel