pcp: Upgrade to 6.3.7 release

* Fix packaging scripts needing bash separately
* Fix packaging QA errors about staticlibs and dev-so
* Add a patch to use native pmcpp during target build

Signed-off-by: Khem Raj <raj.khem@gmail.com>

5 files changed, 65 insertions, 21 deletions

diff --git a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb
index 2f37b099b4..806ef668e2 100644
--- a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb
+++ b/meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb
@@ -44,5 +44,6 @@ do_install () {
     PCP_LIBADM_DIR=${D}/${libdir} \
     PCP_LIB_DIR=${D}/${libdir} \
     PCP_MAN_DIR=${D}/${mandir} \
-    PCP_DOC_DIR=${D}/${docdir} 
+    PCP_DOC_DIR=${D}/${docdir} \
+    PCP_SYSTEMDUNIT_DIR=${D}${systemd_system_unitdir}
 }
diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc
index 5ed2d220f0..4ab4f5502f 100644
--- a/meta-oe/recipes-support/pcp/pcp.inc
+++ b/meta-oe/recipes-support/pcp/pcp.inc
@@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \
                     "
 COMPATIBLE_HOST:libc-musl = "null"
 
-SRC_URI = "git://github.com/performancecopilot/pcp;branch=main;protocol=https \
+SRC_URI = "git://github.com/performancecopilot/pcp;branch=stable;protocol=https \
            file://0001-configure-Limit-the-header-search-to-sysroot.patch \
            file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \
            file://config.linux \
            "
 
-SRCREV = "c13558fd0df54438cbb87cf303dc279cb58816c2"
+SRCREV = "d8d97b79ee47d9dfb076a3242564ed3cae04eba9"
 
 S = "${WORKDIR}/git"
 
@@ -39,5 +39,3 @@ EXTRA_OECONF:append = "\
 PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d"
 
 PACKAGECONFIG ?= ""
-
-PARALLEL_MAKE = ""
diff --git a/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch b/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch
new file mode 100644
index 0000000000..32b9252542
--- /dev/null
+++ b/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch
@@ -0,0 +1,30 @@
+From 4c79ea13b8456155e1acd6a53a2586b6c2c32e05 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 3 May 2025 14:27:30 -0700
+Subject: [PATCH] bind2: Use pmcpp from native builds
+
+This is needed for cross compiling. Fixes
+| ./mk.rewrite
+| ./mk.rewrite: line 41: ../../pmcpp/pmcpp.static: No such file or directory
+| Error: pmcpp failed
+| make[3]: *** [GNUmakefile:54: rewrite.conf] Error 1
+
+Upstream-Status: Inappropriate [Cross-compiling specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/pmdas/bind2/mk.rewrite | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pmdas/bind2/mk.rewrite b/src/pmdas/bind2/mk.rewrite
+index 36e8dc1e61..142a75a824 100755
+--- a/src/pmdas/bind2/mk.rewrite
++++ b/src/pmdas/bind2/mk.rewrite
+@@ -38,7 +38,7 @@ inlist == 1           { print }' \
+     -e 's/[    ][      ]*\([0-9][0-9]*\)/ { pmid -> BIND2.0.\1 }/' \
+ ) >$tmp.tmp
+ 
+-if PCP_CONF=../../include/pcp.conf ../../pmcpp/pmcpp.static -P <$tmp.tmp >>rewrite.conf
++if PCP_CONF=../../include/pcp.conf pmcpp -P <$tmp.tmp >>rewrite.conf
+ then
+     :
+ else
diff --git a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
index 009dfe2d04..2915d48f04 100644
--- a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
+++ b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
@@ -16,14 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  src/pcp/htop/GNUmakefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile
-index 6b7c0c5..5153c63 100644
 --- a/src/pcp/htop/GNUmakefile
 +++ b/src/pcp/htop/GNUmakefile
-@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS))
- CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS))
+@@ -210,8 +210,8 @@ CFGCOLUMNS = $(patsubst %,pcp/columns/%,
+ CFGSCREENS = $(patsubst %,pcp/screens/%,$(SCREENS))
  
- CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS)
+ CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) $(CFGSCREENS)
 -TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES)
 -SUBXFILES = $(SUBCFILES) $(SUBHFILES)
 +TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES)
@@ -31,6 +29,3 @@ index 6b7c0c5..5153c63 100644
  CFILES = $(TOPCFILES) $(SUBCFILES)
  HFILES = $(TOPHFILES) $(SUBHFILES)
  LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \
--- 
-2.41.0
-
diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb
index ce8957714e..c390b9eec2 100644
--- a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb
+++ b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb
@@ -13,12 +13,16 @@ DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptoo
 SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \
             file://pass-options-to-AR.patch \
             file://fix_parallel_make.patch \
+                        file://0001-bind2-Use-pmcpp-from-native-builds.patch \
            "
 
 export PCP_DIR = "${RECIPE_SYSROOT_NATIVE}"
 #export PCP_RUN_DIR = "${RECIPE_SYSROOT_NATIVE}"
-EXTRA_OEMAKE = "CC="${CC}" LD="${LD}""
-inherit useradd systemd features_check python3targetconfig
+EXTRA_OEMAKE = '\
+        CC="${CC}" LD="${LD}" CROSS_COMPILING="yes" \
+    PCP_SYSTEMDUNIT_DIR=${systemd_system_unitdir} \
+'
+inherit useradd systemd features_check python3targetconfig gtk-icon-cache
 
 # Needs libx11
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -48,6 +52,7 @@ USERADD_PARAM:${PN}-testsuite = "--system --home ${localstatedir}/lib/pcp/testsu
                        --user-group pcpqa"
 
 RDEPENDS:${PN} += "perl"
+RDEPENDS:${PN}-xsos += "${PN} bash"
 RDEPENDS:${PN}-testsuite += "${PN} bash perl"
 RDEPENDS:python3-${PN} += "${PN} python3"
 
@@ -69,6 +74,7 @@ do_compile:prepend() {
                 ${S}/src/include/builddefs
         sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile
         export PYTHON=python3
+        export PATH=${PATH}:${RECIPE_SYSROOT_NATIVE}${libexecdir}/pcp/bin
         #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3
 }
 
@@ -85,10 +91,6 @@ do_install () {
         rm -rf ${D}${localstatedir}/lib/pcp/pmcd
         rm -rf ${D}${localstatedir}/lib/pcp/tmp
         rm -rf ${D}${localstatedir}/run
-        mv ${D}${docdir}/C* ${D}${docdir}/pcp-doc/
-        mv ${D}${docdir}/I* ${D}${docdir}/pcp-doc/
-        mv ${D}${docdir}/R* ${D}${docdir}/pcp-doc/
-        mv ${D}${docdir}/V* ${D}${docdir}/pcp-doc/
         sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf
         sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf
         sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf
@@ -99,7 +101,8 @@ do_install () {
                 -e 's#${TMPDIR}##g' ${D}${includedir}/pcp/builddefs
 }
 
-PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \
+PACKAGE_BEFORE_PN = "${PN}-xsos"
+PACKAGES =+ " ${PN}-export-zabbix-agent ${PN}-testsuite \
         libpcp-gui2  libpcp-gui2-dev \
         libpcp-import1 libpcp-archive1 \
         libpcp-mmv1 libpcp-mmv1-dev \
@@ -109,7 +112,7 @@ PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \
         libpcp3 libpcp3-dev python3-${PN}\
 "
 FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \
-"       
+"
 FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \
 "       
 FILES:libpcp-gui2-dev = " \
@@ -118,6 +121,8 @@ FILES:libpcp-gui2-dev = " \
         ${includedir}/pmafm.h \
         ${includedir}/pmtime.h \
 "
+INSANE_SKIP:libpcp-gui2-dev = "staticdev"
+
 FILES:libpcp-mmv1 = " \
         ${libdir}/libpcp_mmv.so.1 \
 "
@@ -130,6 +135,8 @@ FILES:libpcp-mmv1-dev = " \
         ${datadir}/man/man3/mmv_* \
         ${datadir}/man/man5/mmv.5.gz \
 "
+INSANE_SKIP:libpcp-mmv1-dev = "staticdev"
+
 FILES:libpcp-import1 = " \
         ${libdir}/libpcp_import.so.1 \
 "
@@ -145,6 +152,8 @@ FILES:libpcp-pmda3-dev = " \
         ${datadir}/man/man3/PMDA.3.gz \
         ${datadir}/man/man3/pmda* \
 "
+INSANE_SKIP:libpcp-pmda3-dev = "staticdev"
+
 FILES:libpcp-trace2 = " \
         ${libdir}/libpcp_trace.so.2 \
 "
@@ -155,6 +164,8 @@ FILES:libpcp-trace2-dev = " \
         ${libdir}/libpcp_trace.so \
         ${datadir}/man/man3/pmtrace* \
 "
+INSANE_SKIP:libpcp-trace2-dev = "staticdev"
+
 FILES:libpcp-web1 = " \
         ${libdir}/libpcp_web.so.1 \
 "
@@ -166,10 +177,15 @@ FILES:libpcp-web1-dev = " \
         ${datadir}/man/man3/pmhttp* \
         ${datadir}/man/man3/pmjson* \
 "
+INSANE_SKIP:libpcp-web1-dev = "staticdev"
+
 FILES:libpcp3 = " \
         ${libdir}/libpcp.so.3 \
 "
 
+FILES:${PN}-xsos = " \
+        ${libexecdir}/pcp/bin/pcp-xsos \
+"
 FILES:${PN} = " \
         ${sysconfdir}/pcp \
         ${sysconfdir}/cron.d \
@@ -179,6 +195,7 @@ FILES:${PN} = " \
         ${datadir}/bash-completion \
         ${datadir}/pcp-gui \
         ${datadir}/zsh \
+        ${datadir}/icons \
         ${systemd_system_unitdir}/ \
         ${libdir}/pcp/ \
         ${libdir}/sysusers.d/pcp.conf \
@@ -192,6 +209,7 @@ FILES:${PN} = " \
         ${localstatedir}/lib/pcp/pmdas/ \
         ${localstatedir}/lib/pcp/pmns \
         ${libdir}/libpcp_fault.so.3 \
+        ${nonarch_libdir}/tmpfiles.d/pcp-reboot-init.conf \
 "
 
 FILES:${PN}-export-zabbix-agent += " \
@@ -200,6 +218,8 @@ FILES:${PN}-export-zabbix-agent += " \
         ${mandir}/man3/zbxpcp.3.gz \
         ${libdir}/zabbix \
 "
+INSANE_SKIP:${PN}-export-zabbix-agent = "dev-so"
+
 FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf"
 FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
 FILES:${PN}-dev += " \