[PATCH v5.15 v2 2/4] scripts/pahole-flags.sh: Use pahole-version.sh

From: Matthias Maennich
Date: Thu Feb 23 2023 - 06:54:31 EST


From: Nathan Chancellor <nathan@xxxxxxxxxx>

[ Upstream commit 2d6c9810eb8915c4ddede707b8e167a1d919e1ca ]

Use pahole-version.sh to get pahole's version code to reduce the amount
of duplication across the tree.

Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
Link: https://lore.kernel.org/bpf/20220201205624.652313-4-nathan@xxxxxxxxxx
Signed-off-by: Matthias Maennich <maennich@xxxxxxxxxx>
---
scripts/pahole-flags.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
index 7acee326aa6c..d38fa6d84d62 100755
--- a/scripts/pahole-flags.sh
+++ b/scripts/pahole-flags.sh
@@ -7,7 +7,7 @@ if ! [ -x "$(command -v ${PAHOLE})" ]; then
exit 0
fi

-pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
+pahole_ver=$($(dirname $0)/pahole-version.sh ${PAHOLE})

if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
# pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars
--
2.39.2.637.g21b0678d19-goog