From: Peter van Dijk Date: Thu, 29 Jun 2023 10:26:05 +0000 (+0200) Subject: workaround: recognise centos-7 target name too in provenance generation X-Git-Tag: rec-5.0.0-alpha1~142^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12965%2Fhead;p=thirdparty%2Fpdns.git workaround: recognise centos-7 target name too in provenance generation --- diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild index 6ba2911557..c18859c260 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmbuild +++ b/builder-support/dockerfiles/Dockerfile.rpmbuild @@ -59,10 +59,10 @@ RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then @ENDIF # Generate provenance -@IF [ ${BUILDER_TARGET} = el-7 ] +@IF [ ${BUILDER_TARGET} = el-7 || ${BUILDER_TARGET} = centos-7 ] @EVAL RUN python builder/helpers/generate-yum-provenance.py /dist/packages-${BUILDER_TARGET}.json || python3 builder/helpers/generate-yum-provenance.py /dist/packages-${BUILDER_TARGET}.json @ENDIF -@IF [ ${BUILDER_TARGET} != el-7 ] +@IF [ ${BUILDER_TARGET} != el-7 && ${BUILDET_TARGET} != centos-7 ] @EVAL RUN python builder/helpers/generate-dnf-provenance.py /dist/packages-${BUILDER_TARGET}.json || python3 builder/helpers/generate-dnf-provenance.py /dist/packages-${BUILDER_TARGET}.json @ENDIF