Update to latest PCP release

Related: RHEL-43429

pcp.spec

@@ -1,14 +1,11 @@
 Name:    pcp
-Version: 6.2.2
+Version: 6.3.0
-Release: 5%{?dist}
+Release: 1%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPL-2.0-or-later AND LGPL-2.1-or-later AND CC-BY-3.0
 URL:     https://pcp.io
 
 Source0: https://github.com/performancecopilot/pcp/releases/pcp-%{version}.src.tar.gz
-
-Patch1: pmcd-logdir-tmpfiles.patch
-
 %if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
 ExcludeArch: %{ix86}
 %endif
@@ -23,11 +20,13 @@ ExcludeArch: %{ix86}
 %global __python2 python
 %endif
 
-# UsrMerge was completed in EL 7, however the latest 'hostname' package in EL 7 contains "Provides: /bin/hostname"
+# UsrMerge was completed in EL 7, however the latest 'hostname' package in EL 7 contains "Provides: /bin/hostname".  Likewise for /bin/ps from procps[-ng] packages.
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 17
 %global _hostname_executable /usr/bin/hostname
+%global _ps_executable /usr/bin/ps
 %else
 %global _hostname_executable /bin/hostname
+%global _ps_executable /bin/ps
 %endif
 
 %global disable_perl 0
@@ -219,6 +218,12 @@ ExcludeArch: %{ix86}
 %global disable_xlsx 1
 %endif
 
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+%global disable_amdgpu 0
+%else
+%global disable_amdgpu 1
+%endif
+
 # prevent conflicting binary and man page install for pcp(1)
 Conflicts: librapi < 0.16
 
@@ -297,6 +302,7 @@ BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) perl(JSON)
 BuildRequires: perl(Time::HiRes) perl(Digest::MD5)
 BuildRequires: perl(XML::LibXML) perl(File::Slurp)
 BuildRequires: %{_hostname_executable}
+BuildRequires: %{_ps_executable}
 %if !%{disable_systemd}
 BuildRequires: systemd-devel
 %endif
@@ -313,7 +319,7 @@ BuildRequires: qt5-qtsvg-devel
 
 # Utilities used indirectly e.g. by scripts we install
 Requires: bash xz gawk sed grep coreutils diffutils findutils
-Requires: which %{_hostname_executable}
+Requires: which %{_hostname_executable} %{_ps_executable}
 Requires: pcp-libs = %{version}-%{release}
 
 %if !%{disable_selinux}
@@ -594,6 +600,9 @@ Requires: pcp-pmda-json
 Requires: pcp-pmda-resctrl
 %endif
 Requires: pcp-pmda-summary pcp-pmda-trace pcp-pmda-weblog
+%if !%{disable_amdgpu}
+Requires: pcp-pmda-amdgpu
+%endif
 Requires: pcp-system-tools
 %if !%{disable_qt}
 Requires: pcp-gui
@@ -2272,6 +2281,23 @@ collecting metrics about web server logs.
 # end pcp-pmda-weblog
 # end C pmdas
 
+%if !%{disable_amdgpu}
+#
+# pcp-pmda-amdgpu
+#
+%package pmda-amdgpu
+License: GPL-2.0-or-later
+Summary: Performance Co-Pilot (PCP) metrics from AMD GPU devices
+URL: https://pcp.io
+Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
+Requires: libdrm
+BuildRequires: libdrm-devel
+%description pmda-amdgpu
+This package contains the PCP Performance Metrics Domain Agent (PMDA) for
+extracting performance metrics from AMDGPU devices.
+# end pcp-pmda-amdgpu
+%endif
+
 %package zeroconf
 License: GPL-2.0-or-later
 Summary: Performance Co-Pilot (PCP) Zeroconf Package
@@ -2580,7 +2606,7 @@ basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|htop|pcp2csv' \
    -e 'pcp-atop|pcp-dmcache|pcp-dstat|pcp-free' \
    -e 'pcp-htop|pcp-ipcs|pcp-iostat|pcp-lvmcache|pcp-mpstat' \
    -e 'pcp-numastat|pcp-pidstat|pcp-shping|pcp-ss' \
-   -e 'pcp-tapestat|pcp-uptime|pcp-verify' | \
+   -e 'pcp-tapestat|pcp-uptime|pcp-verify|pcp-xsos' | \
    cull 'selinux|pmlogconf|pmieconf|pmrepconf' >pcp-system-tools-files
 basic_manifest | keep 'geolocate' >pcp-geolocate-files
 basic_manifest | keep 'sar2pcp' >pcp-import-sar2pcp-files
@@ -2601,6 +2627,7 @@ basic_manifest | keep 'pcp2xml' >pcp-export-pcp2xml-files
 basic_manifest | keep 'pcp2zabbix' >pcp-export-pcp2zabbix-files
 basic_manifest | keep 'zabbix|zbxpcp' | cull pcp2zabbix >pcp-export-zabbix-agent-files
 basic_manifest | keep '(etc/pcp|pmdas)/activemq(/|$)' >pcp-pmda-activemq-files
+basic_manifest | keep '(etc/pcp|pmdas)/amdgpu(/|$)' >pcp-pmda-amdgpu-files
 basic_manifest | keep '(etc/pcp|pmdas)/apache(/|$)' >pcp-pmda-apache-files
 basic_manifest | keep '(etc/pcp|pmdas)/bash(/|$)' >pcp-pmda-bash-files
 basic_manifest | keep '(etc/pcp|pmdas)/bcc(/|$)' >pcp-pmda-bcc-files
@@ -2680,7 +2707,7 @@ basic_manifest | keep '(etc/pcp|pmdas)/zswap(/|$)' >pcp-pmda-zswap-files
 
 rm -f packages.list
 for pmda_package in \
-    activemq apache \
+    activemq amdgpu apache \
     bash bcc bind2 bonding bpf bpftrace \
     cifs cisco \
     dbping denki docker dm ds389 ds389log \
@@ -3133,6 +3160,11 @@ exit 0
 %preun pmda-weblog
 %{pmda_remove "$1" "weblog"}
 
+%if !%{disable_amdgpu}
+%preun pmda-amdgpu
+%{pmda_remove "$1" "amdgpu"}
+%endif
+
 %preun
 if [ "$1" -eq 0 ]
 then
@@ -3451,6 +3483,10 @@ fi
 %files pmda-openmetrics -f pcp-pmda-openmetrics-files.rpm
 %endif
 
+%if !%{disable_amdgpu}
+%files pmda-amdgpu -f pcp-pmda-amdgpu-files.rpm
+%endif
+
 %files pmda-apache -f pcp-pmda-apache-files.rpm
 
 %files pmda-bash -f pcp-pmda-bash-files.rpm
@@ -3535,6 +3571,30 @@ fi
 %files zeroconf -f pcp-zeroconf-files.rpm
 
 %changelog
+* Thu Aug 1 2024 Nathan Scott <nathans@redhat.com> - 6.3.0-1
+- Update to latest stable version of PCP (RHEL-43429)
+
+* Wed Apr 10 2024 Nathan Scott <nathans@redhat.com> - 6.2.1-1
+- Rebase to latest stable version of PCP (RHEL-30198)
+
+* Wed Mar 20 2024 Nathan Scott <nathans@redhat.com> - 6.2.0-2
+- Fix python sub-package year day range issue (RHEL-25543)
+
+* Mon Feb 12 2024 Nathan Scott <nathans@redhat.com> - 6.2.0-1
+- Rebase to latest stable version of PCP (RHEL-2317)
+
+* Thu Dec 14 2023 Nathan Scott <nathans@redhat.com> - 6.1.1-4
+- Fix pcp-ss(1) handling of UDP packet states (RHEL-17649)
+
+* Wed Nov 29 2023 Nathan Scott <nathans@redhat.com> - 6.1.1-2
+- Fix pcp-ss(1) default handling of listen state (RHEL-17335)
+- Added pcp package dependency on diffutils for diffstat(1)
+
+* Mon Nov 20 2023 Nathan Scott <nathans@redhat.com> - 6.1.1-1
+- Improve pmlogcheck performance with compressed archives (RHEL-3930)
+- Fix pcp-ss(1) utility handling of duplicate sources (RHEL-7498)
+- Fine-tune PCP python wrapper path resolution (RHEL-7509)
+- Rebase to latest stable version of PCP (RHEL-2317)
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.2.2-5
 - Bump release for June 2024 mass rebuild
 

pmcd-logdir-tmpfiles.patch

@@ -1,12 +0,0 @@
-diff -Naurp pcp-6.2.2.orig/tmpfiles.init.setup.in pcp-6.2.2/tmpfiles.init.setup.in
---- pcp-6.2.2.orig/tmpfiles.init.setup.in	2024-05-07 10:37:04.000000000 +1000
-+++ pcp-6.2.2/tmpfiles.init.setup.in	2024-05-16 09:18:49.200282601 +1000
-@@ -3,7 +3,7 @@
- # Type	Path			Mode	User	Group	Age	Argument
- D	PCP_RUN_DIR		0775	PCP_USER	PCP_GROUP	-	-
- d	PCP_LOG_DIR		0775	PCP_USER	PCP_GROUP	-	-
--d	PCP_LOG_DIR/pmcd	0775	root	root	-	-
-+d	PCP_LOG_DIR/pmcd	0755	root	root	-	-
- d	PCP_LOG_DIR/pmfind	0775	PCP_USER	PCP_GROUP	-	-
- d	PCP_LOG_DIR/pmie	0775	PCP_USER	PCP_GROUP	-	-
- d	PCP_LOG_DIR/pmlogger	0775	PCP_USER	PCP_GROUP	-	-

sources

@@ -1 +1 @@
-SHA512 (pcp-6.2.2.src.tar.gz) = 4d28067583fb6c589fa7b419a67e26fafd6ec2453bcc4c8df2848985b63cb792660378ed1f39f456a7bf1e1165e17d76b74beb8a3739e417fe69fb8c8a5cda77
+SHA512 (pcp-6.3.0.src.tar.gz) = e9a85ce0c51412fe59879694b027c8b489fef461b6d8133f8f01397d8553366b0a7967d150e0f939707ee704402c1710f93333f0c4ce3174cfdc36b48300e6e8