rpms/pcp
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Apply 0001-pmdahacluster-handle-pacemaker-2.1.5-crm_mon-output-changes.patch

Browse Source
This commit is contained in:
eabdullin 2023-08-03 15:01:10 +03:00
parent bbcb0b03f8
commit bf3757b150
2 changed files with 743 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

735
SOURCES/0001-pmdahacluster-handle-pacemaker-2.1.5-crm_mon-output-changes.patch Normal file
View File

File diff suppressed because one or more lines are too long

9
SPECS/pcp.spec
View File

@ -1,6 +1,6 @@
Name: pcp Name: pcp
Version: 6.0.1 Version: 6.0.1
Release: 4%{?dist} Release: 5%{?dist}.alma
Summary: System-level performance monitoring and performance management Summary: System-level performance monitoring and performance management
License: GPLv2+ and LGPLv2+ and CC-BY License: GPLv2+ and LGPLv2+ and CC-BY
URL: https://pcp.io URL: https://pcp.io
@ -10,6 +10,9 @@ Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz
Patch0: redhat-bugzilla-2117074-vendored_vmlinux.h.patch Patch0: redhat-bugzilla-2117074-vendored_vmlinux.h.patch
Patch1: redhat-bugzilla-2117074-ppc_arm_vmlinux.h.patch Patch1: redhat-bugzilla-2117074-ppc_arm_vmlinux.h.patch
# Patch was taken from and fixed to apply it cleanly:
# https://github.com/performancecopilot/pcp/commit/9135e7d7b1ea45b472f9d141ceab112c84a81a63
Patch1001: 0001-pmdahacluster-handle-pacemaker-2.1.5-crm_mon-output-changes.patch
# The additional linker flags break out-of-tree PMDAs. # The additional linker flags break out-of-tree PMDAs.
# https://bugzilla.redhat.com/show_bug.cgi?id=2043092 # https://bugzilla.redhat.com/show_bug.cgi?id=2043092
@ -2292,6 +2295,7 @@ updated policy package.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch1001 -p1
%build %build
# the buildsubdir macro gets defined in %%setup and is apparently only available in the next step (i.e. the %%build step) # the buildsubdir macro gets defined in %%setup and is apparently only available in the next step (i.e. the %%build step)
@ -3367,6 +3371,9 @@ fi
%files zeroconf -f pcp-zeroconf-files.rpm %files zeroconf -f pcp-zeroconf-files.rpm
%changelog %changelog
* Thu Aug 03 2023 Eduard Abdullin <eabdullin@almalinux.org> - 6.0.1-5.alma
- Apply 0001-pmdahacluster-handle-pacemaker-2.1.5-crm_mon-output-changes.patch
* Tue Jan 17 2023 Nathan Scott <nathans@redhat.com> - 6.0.1-4 * Tue Jan 17 2023 Nathan Scott <nathans@redhat.com> - 6.0.1-4
- Rebuild for dependency on new version of libbpf (BZ 2159276) - Rebuild for dependency on new version of libbpf (BZ 2159276)