reenable PMCD_LOCAL and PMLOGGER_LOCAL via patch
This commit is contained in:
parent
6298d8f844
commit
3a347682f2
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ pcp-webapp-*.tar.gz
|
|||||||
pcp-webjs-*
|
pcp-webjs-*
|
||||||
vector-*
|
vector-*
|
||||||
/pcp-revert-pmlogger_daily-daystart.patch
|
/pcp-revert-pmlogger_daily-daystart.patch
|
||||||
|
/pmcd-pmlogger-local-context.patch
|
||||||
|
16
pcp.spec
16
pcp.spec
@ -1,6 +1,6 @@
|
|||||||
Name: pcp
|
Name: pcp
|
||||||
Version: 4.3.0
|
Version: 4.3.0
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: System-level performance monitoring and performance management
|
Summary: System-level performance monitoring and performance management
|
||||||
License: GPLv2+ and LGPLv2.1+ and CC-BY
|
License: GPLv2+ and LGPLv2.1+ and CC-BY
|
||||||
URL: https://pcp.io
|
URL: https://pcp.io
|
||||||
@ -15,6 +15,7 @@ Source3: %{github}/pcp-webapp-graphite/archive/0.9.10/pcp-webapp-graphite-0.9.10
|
|||||||
Source4: %{github}/pcp-webapp-blinkenlights/archive/1.0.1/pcp-webapp-blinkenlights-1.0.1.tar.gz
|
Source4: %{github}/pcp-webapp-blinkenlights/archive/1.0.1/pcp-webapp-blinkenlights-1.0.1.tar.gz
|
||||||
# patch for GH#597
|
# patch for GH#597
|
||||||
Patch0: pcp-revert-pmlogger_daily-daystart.patch
|
Patch0: pcp-revert-pmlogger_daily-daystart.patch
|
||||||
|
Patch1: pmcd-pmlogger-local-context.patch
|
||||||
|
|
||||||
%if 0%{?fedora} >= 26 || 0%{?rhel} > 7
|
%if 0%{?fedora} >= 26 || 0%{?rhel} > 7
|
||||||
%global __python2 python2
|
%global __python2 python2
|
||||||
@ -2133,6 +2134,7 @@ updated policy package.
|
|||||||
%setup -q -T -D -a 4 -c -n blinkenlights
|
%setup -q -T -D -a 4 -c -n blinkenlights
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if !%{disable_python2} && 0%{?default_python} != 3
|
%if !%{disable_python2} && 0%{?default_python} != 3
|
||||||
@ -2202,15 +2204,6 @@ for f in $RPM_BUILD_ROOT/%{_initddir}/{pcp,pmcd,pmlogger,pmie,pmwebd,pmmgr,pmpro
|
|||||||
sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f
|
sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f
|
||||||
done
|
done
|
||||||
|
|
||||||
%if 0%{?fedora} > 26
|
|
||||||
if [ "$1" -eq 1 ]
|
|
||||||
then
|
|
||||||
PCP_SYSCONFIG_DIR=%{_sysconfdir}/sysconfig
|
|
||||||
sed -i 's/^\#\ PMLOGGER_LOCAL.*/PMLOGGER_LOCAL=1/g' "$RPM_BUILD_ROOT/$PCP_SYSCONFIG_DIR/pmlogger"
|
|
||||||
sed -i 's/^\#\ PMCD_LOCAL.*/PMCD_LOCAL=1/g' "$RPM_BUILD_ROOT/$PCP_SYSCONFIG_DIR/pmcd"
|
|
||||||
fi
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# list of PMDAs in the base pkg
|
# list of PMDAs in the base pkg
|
||||||
ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
|
ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
|
||||||
grep -E -v '^simple|sample|trivial|txmon' |\
|
grep -E -v '^simple|sample|trivial|txmon' |\
|
||||||
@ -3319,6 +3312,9 @@ cd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 12 2019 Lukas Berk <lberk@redhat.com> - 4.3.0-5
|
||||||
|
- Add patch to enable PMCD_LOCAL and PMLOGGER_LOCAL sysconfig vars
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-4
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
3
sources
3
sources
@ -1,6 +1,7 @@
|
|||||||
SHA512 (pcp-4.3.0.src.tar.gz) = 9dd6e3aeb05e1e90408365b87dc850a6ddd6576b5697d9c61c8d4316503397daa38198ceec92ca83f4e0b3a668c43c0c50f710b6919782d63b6e7b8cdcf33f3b
|
SHA512 (pcp-4.3.0.src.tar.gz) = 9dd6e3aeb05e1e90408365b87dc850a6ddd6576b5697d9c61c8d4316503397daa38198ceec92ca83f4e0b3a668c43c0c50f710b6919782d63b6e7b8cdcf33f3b
|
||||||
SHA512 (pcp-webapp-blinkenlights-1.0.1.tar.gz) = dadf0bc0742a3344a75f8f304851762572ddc9a5c7c66fd085adcabb70f9e7a9b2c9b6095a8fb358f6a6c64dbf41cf245e2da74a60b8120880f314b6ed3d271c
|
SHA512 (pcp-webapp-blinkenlights-1.0.1.tar.gz) = dadf0bc0742a3344a75f8f304851762572ddc9a5c7c66fd085adcabb70f9e7a9b2c9b6095a8fb358f6a6c64dbf41cf245e2da74a60b8120880f314b6ed3d271c
|
||||||
SHA512 (pcp-webapp-vector-1.3.1-1.tar.gz) = b1463d4da3727f130752699dd433e997212c19241ac440df389c1153e468ace840b7d5f43a37b2173e4eee4f4a807338a3c40cc9635801e626c1530baf46e289
|
|
||||||
SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21
|
SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21
|
||||||
SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa
|
SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa
|
||||||
|
SHA512 (pcp-webapp-vector-1.3.1-1.tar.gz) = b1463d4da3727f130752699dd433e997212c19241ac440df389c1153e468ace840b7d5f43a37b2173e4eee4f4a807338a3c40cc9635801e626c1530baf46e289
|
||||||
SHA512 (pcp-revert-pmlogger_daily-daystart.patch) = b12febf6b7df9a79a225f5aff858b2ef755428349d86181f98da5986c479ab4375ffaa55af3dd749725341e4026fa26d54287f1668f19acbe59ff1c97e16967c
|
SHA512 (pcp-revert-pmlogger_daily-daystart.patch) = b12febf6b7df9a79a225f5aff858b2ef755428349d86181f98da5986c479ab4375ffaa55af3dd749725341e4026fa26d54287f1668f19acbe59ff1c97e16967c
|
||||||
|
SHA512 (pmcd-pmlogger-local-context.patch) = 8f4b6b49494781d0a711ac27738a75b1adead72cb1baef9a78754686c48ae2d278d691108233e9cf9ad33fede5ba7b7a43f4674205b9bf448f267c844ddc1a01
|
||||||
|
Loading…
Reference in New Issue
Block a user