!61 [sync] PR-60: Fix executing systemctl stop failed

From: @openeuler-sync-bot 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2022-02-21 01:53:47 +00:00 committed by Gitee
commit 9b41a736d3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 43 additions and 2 deletions

View File

@ -0,0 +1,37 @@
From c387219daf1869772e845d3090907047b991edd7 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Thu, 17 Feb 2022 18:21:52 +0800
Subject: [PATCH] remove Wants=pmcd from pmlogger and pmie
---
src/pmie/pmie.service.in | 1 -
src/pmlogger/pmlogger.service.in | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/pmie/pmie.service.in b/src/pmie/pmie.service.in
index d234c8a..75696de 100644
--- a/src/pmie/pmie.service.in
+++ b/src/pmie/pmie.service.in
@@ -4,7 +4,6 @@ Documentation=man:pmie(1)
After=network-online.target pmcd.service
Before=pmie_check.timer pmie_daily.timer
BindsTo=pmie_check.timer pmie_daily.timer
-Wants=pmcd.service
[Service]
Type=notify
diff --git a/src/pmlogger/pmlogger.service.in b/src/pmlogger/pmlogger.service.in
index de0df29..db6a4db 100644
--- a/src/pmlogger/pmlogger.service.in
+++ b/src/pmlogger/pmlogger.service.in
@@ -4,7 +4,6 @@ Documentation=man:pmlogger(1)
After=network-online.target pmcd.service
Before=pmlogger_check.timer pmlogger_daily.timer
BindsTo=pmlogger_check.timer pmlogger_daily.timer
-Wants=pmcd.service
[Service]
Type=notify
--
2.27.0

View File

@ -53,10 +53,11 @@
Name: pcp
Version: 5.3.5
Summary: System-level performance monitoring and performance management
Release: 1
Release: 2
License: GPLv2+ and LGPLv2.1+ and CC-BY
URL: https://pcp.io
Source0: https://github.com/performancecopilot/pcp/archive/refs/tags/5.3.5.tar.gz
Patch0001: 0001-remove-Wants-pmcd-from-pmlogger-and-pmie.patch
BuildRequires: make
BuildRequires: gcc gcc-c++
@ -1028,7 +1029,7 @@ interface rules, type enforcement and file context adjustments for an
updated policy package.
%prep
%setup -q
%autosetup -p1
%build
@ -1926,6 +1927,9 @@ systemctl condrestart pmproxy.service >/dev/null 2>&1
%changelog
* Fri Feb 18 2022 baizhonggui <baizhonggui@huawei.com> - 5.3.5-2
- Fix systemctl stop failed by removing Wants=pmcd.service from pmlogger.service and pmie.service
* Thu Feb 10 2022 wangkai <wangkai385@huawei.com> - 5.3.5-1
- Update to 5.3.5