From 5d06a47116076e822561cdd51d69ab5dde431cdc Mon Sep 17 00:00:00 2001
From: laokz <zhangkai@iscas.ac.cn>
Date: Wed, 20 Mar 2024 20:52:58 +0800
Subject: [PATCH] riscv: backport upstream patch to fix config variable

(cherry picked from commit be260e40fcecfd0e442647bf444bc41bd0220e30)
---
 0001-riscv-config-pmdabpf_arch-value.patch | 44 ++++++++++++++++++++++
 pcp.spec                                   |  8 +++-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 0001-riscv-config-pmdabpf_arch-value.patch

diff --git a/0001-riscv-config-pmdabpf_arch-value.patch b/0001-riscv-config-pmdabpf_arch-value.patch
new file mode 100644
index 0000000..a0b760e
--- /dev/null
+++ b/0001-riscv-config-pmdabpf_arch-value.patch
@@ -0,0 +1,44 @@
+From 63057ef329a5d5450b60f0ca66cb1dc0ab1853b2 Mon Sep 17 00:00:00 2001
+From: Kai Zhang <zhangkai@iscas.ac.cn>
+Date: Wed, 20 Mar 2024 19:46:30 +0800
+Subject: [PATCH] riscv: config pmdabpf_arch value
+
+Configure scripts use pmdabpf_arch to refer to architecture
+directory of iovisor/bcc/libbpf-tools, which hold kernel
+vmlinux.h. For RISC-V, the unique directory name is 'riscv'.
+We need to sed uname's value riscv64 etc. to adapt this.
+
+Signed-off-by: Kai Zhang <zhangkai@iscas.ac.cn>
+---
+ configure    | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 14e8c3cf5..b0f7dae89 100755
+--- a/configure
++++ b/configure
+@@ -9105,7 +9105,7 @@
+ 
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking BPF CO-RE architecture identifier" >&5
+ printf %s "checking BPF CO-RE architecture identifier... " >&6; }
+-pmdabpf_arch=`uname -m | sed 's/x86_64/x86/' | sed 's/aarch64/arm64/' | sed 's/ppc64le/powerpc/' | sed 's/mips.*/mips/'`
++pmdabpf_arch=`uname -m | sed 's/x86_64/x86/' | sed 's/aarch64/arm64/' | sed 's/ppc64le/powerpc/' | sed 's/mips.*/mips/' | sed 's/riscv.*/riscv/'`
+ 
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pmdabpf_arch" >&5
+ printf "%s\n" "$pmdabpf_arch" >&6; }
+diff --git a/configure.ac b/configure.ac
+index f8e855019..51887d26c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1172,7 +1172,7 @@
+ 
+ dnl Get BPF CO-RE arch identifier
+ AC_MSG_CHECKING([BPF CO-RE architecture identifier])
+-pmdabpf_arch=`uname -m | sed 's/x86_64/x86/' | sed 's/aarch64/arm64/' | sed 's/ppc64le/powerpc/' | sed 's/mips.*/mips/'`
++pmdabpf_arch=`uname -m | sed 's/x86_64/x86/' | sed 's/aarch64/arm64/' | sed 's/ppc64le/powerpc/' | sed 's/mips.*/mips/' | sed 's/riscv.*/riscv/'`
+ AC_SUBST(pmdabpf_arch)
+ AC_MSG_RESULT($pmdabpf_arch)
+ 
+-- 
+2.43.0
diff --git a/pcp.spec b/pcp.spec
index 7911c69..42043c5 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,11 +1,12 @@
 Name:    pcp
 Version: 6.1.1
-Release: 1
+Release: 2
 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
+Patch0:  0001-riscv-config-pmdabpf_arch-value.patch
 
 # The additional linker flags break out-of-tree PMDAs.
 # https://bugzilla.redhat.com/show_bug.cgi?id=2043092
@@ -2125,7 +2126,7 @@ sed -i '/.a$/d' pcp-devel-files
 sed -i '/\/man\//d' pcp-devel-files
 sed -i '/\/include\//d' pcp-devel-files
 
-%ifarch x86_64 ppc64 ppc64le aarch64 s390x
+%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64
 sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-libs-files
 sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-devel-files
 sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-libs-devel-files
@@ -3098,6 +3099,9 @@ fi
 
 
 %changelog
+* Wed Mar 20 2024 laokz <zhangkai@iscas.ac.cn> - 6.1.1-2
+- riscv: backport upstream patch to fix config variable
+
 * Mon Jan 08 2024 wangkai <13474090681@163.com> - 6.1.1-1
 - Upgrade 6.1.1
 
-- 
Gitee