From: Peter van Dijk Date: Tue, 11 Feb 2020 12:22:44 +0000 (+0100) Subject: builder: also touch /var/lib/rpm/* before build-specs X-Git-Tag: auth-4.3.0-beta2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d56a81d9050e52d23e122c62e853fc9731f425;p=thirdparty%2Fpdns.git builder: also touch /var/lib/rpm/* before build-specs --- diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild index a7e3d3dabe..85bb0940cf 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmbuild +++ b/builder-support/dockerfiles/Dockerfile.rpmbuild @@ -23,7 +23,7 @@ ADD builder-support/specs/ /pdns/builder-support/specs RUN find /pdns/builder-support/specs/ -not -name '*.spec' -exec ln -s {} /root/rpmbuild/SOURCES/ \; @IF [ ! -z "$M_authoritative" ] -RUN if $(grep -q 'release 6' /etc/redhat-release); then \ +RUN touch /var/lib/rpm/* && if $(grep -q 'release 6' /etc/redhat-release); then \ scl enable devtoolset-7 -- builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \ else \ builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \ @@ -31,7 +31,7 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \ @ENDIF @IF [ ! -z "$M_recursor" ] -RUN if $(grep -q 'release 6' /etc/redhat-release); then \ +RUN touch /var/lib/rpm/* && if $(grep -q 'release 6' /etc/redhat-release); then \ scl enable devtoolset-7 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \ else \ builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \ @@ -50,7 +50,7 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \ cd /pdns; \ fi -RUN if $(grep -q 'release 6' /etc/redhat-release); then \ +RUN touch /var/lib/rpm/* && if $(grep -q 'release 6' /etc/redhat-release); then \ scl enable devtoolset-7 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \ else \ builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \