Exclude pcie_errors on s390x, it fails to build
The collectd pcie-errors plugin fails to build on s390 on big endian, ppc64le is fine. For those building containers on s390x, this patch removes a downstream patch. Change-Id: I71008f690fcb04289451efa819b5e7f6d81cf99f
This commit is contained in:
parent
f1f1d85459
commit
2c7835bf24
|
@ -39,7 +39,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'collectd-openldap',
|
'collectd-openldap',
|
||||||
'collectd-ovs-events',
|
'collectd-ovs-events',
|
||||||
'collectd-ovs-stats',
|
'collectd-ovs-stats',
|
||||||
'collectd-pcie-errors',
|
|
||||||
'collectd-ping',
|
'collectd-ping',
|
||||||
'collectd-procevent',
|
'collectd-procevent',
|
||||||
'collectd-python',
|
'collectd-python',
|
||||||
|
@ -80,6 +79,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% if base_arch != 's390x' %}
|
||||||
|
{% set collectd_packages = collectd_packages + [
|
||||||
|
'collectd-pcie-errors'
|
||||||
|
] %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{{ macros.install_packages(collectd_packages | customizable("packages")) }}
|
{{ macros.install_packages(collectd_packages | customizable("packages")) }}
|
||||||
|
|
Loading…
Reference in New Issue