From c257e9b3edd63cbea73707b77e99acb5682812e5 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 28 Aug 2017 13:48:19 +1000 Subject: [PATCH] No longer build infiniband and papi PMDAs on armv7hl --- pcp.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pcp.spec b/pcp.spec index 577c578..8bceb12 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,6 +1,6 @@ Name: pcp Version: 3.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2.1+ and CC-BY URL: http://www.pcp.io @@ -23,8 +23,8 @@ Source4: %{github}/pcp-webapp-blinkenlights/archive/1.0.0/pcp-webapp-blinkenligh %global disable_snmp 0 -# There are no papi/libpfm devel packages for s390 nor for some rhels, disable -%ifarch s390 s390x +# There are no papi/libpfm devel packages for s390, armv7hl nor for some rhels, disable +%ifarch s390 s390x armv7hl %global disable_papi 1 %global disable_perfevent 1 %else @@ -221,8 +221,8 @@ Obsoletes: pcp-gui-debuginfo %global _with_initd --with-rcdir=%{_initddir} %endif -# we never want Infiniband on s390 platforms -%ifarch s390 s390x +# we never want Infiniband on s390 and armv7hl platforms +%ifarch s390 s390x armv7hl %global disable_infiniband 1 %else # we never want Infiniband on RHEL5 or earlier @@ -3096,6 +3096,9 @@ cd %endif %changelog +* Mon Aug 28 2017 Nathan Scott - 3.12.1-3 +- Disable infiniband and papi packages on armv7hl (BZ 1485692) + * Fri Aug 25 2017 Lukas Berk - 3.12.1-2 - Rebuild for infiniband dep breakage.