From 05a4807033439384863bada0f49fafdfee713daa Mon Sep 17 00:00:00 2001 From: baizg1107 Date: Wed, 9 Mar 2022 17:13:18 +0800 Subject: [PATCH] revert removing Wants=pmcd.service from pmlogger and pmie --- 0001-fix-pmlogger-exec-error.patch | 24 ------------ ...ve-Wants-pmcd-from-pmlogger-and-pmie.patch | 37 ------------------- pcp.spec | 7 ++-- 3 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 0001-fix-pmlogger-exec-error.patch delete mode 100644 0001-remove-Wants-pmcd-from-pmlogger-and-pmie.patch diff --git a/0001-fix-pmlogger-exec-error.patch b/0001-fix-pmlogger-exec-error.patch deleted file mode 100644 index b8eb201..0000000 --- a/0001-fix-pmlogger-exec-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 12ebc75ba35f223a8f2a62269e3458d075d71a67 Mon Sep 17 00:00:00 2001 -From: baizg1107 -Date: Mon, 28 Feb 2022 15:53:35 +0800 -Subject: [PATCH] fix pmlogger exec error - ---- - src/pmlogger/pmlogger.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pmlogger/pmlogger.service.in b/src/pmlogger/pmlogger.service.in -index db6a4db..a837238 100644 ---- a/src/pmlogger/pmlogger.service.in -+++ b/src/pmlogger/pmlogger.service.in -@@ -14,6 +14,7 @@ EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger - TimeoutStartSec=120 - TimeoutStopSec=120 - Restart=always -+ExecStartPre=@PCP_RC_DIR@/pmcd start-systemd - ExecStart=@PCP_RC_DIR@/pmlogger start-systemd - ExecStop=@PCP_RC_DIR@/pmlogger stop-systemd - PIDFile=@PCP_RUN_DIR@/pmlogger.pid --- -2.27.0 - diff --git a/0001-remove-Wants-pmcd-from-pmlogger-and-pmie.patch b/0001-remove-Wants-pmcd-from-pmlogger-and-pmie.patch deleted file mode 100644 index 8d3a292..0000000 --- a/0001-remove-Wants-pmcd-from-pmlogger-and-pmie.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c387219daf1869772e845d3090907047b991edd7 Mon Sep 17 00:00:00 2001 -From: baizg1107 -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 - diff --git a/pcp.spec b/pcp.spec index 2255159..4ba7021 100644 --- a/pcp.spec +++ b/pcp.spec @@ -53,12 +53,10 @@ Name: pcp Version: 5.3.5 Summary: System-level performance monitoring and performance management -Release: 5 +Release: 6 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 -Patch0002: 0001-fix-pmlogger-exec-error.patch BuildRequires: make BuildRequires: gcc gcc-c++ BuildRequires: procps autoconf bison flex @@ -1930,6 +1928,9 @@ systemctl condrestart pmproxy.service >/dev/null 2>&1 %changelog +* Wed Mar 9 2022 baizhonggui - 5.3.5-6 +- Revert removing Wants=pmcd.service from pmie and pmlogger + * Fri Mar 4 2022 baizhonggui - 5.3.5-5 - Strip the symbol table -- Gitee