From 308fb37a8db7d6ab10e386ad1576453f15da4533 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 3 Apr 2018 14:06:25 +0200
Subject: [PATCH] builder: reinstate building all

---
 .gitignore                                    |  1 +
 builder                                       |  2 +-
 .../dockerfiles/Dockerfile.debbuild           |  6 +++---
 .../dockerfiles/Dockerfile.rpmbuild           |  6 +++---
 .../dockerfiles/Dockerfile.target.sdist       | 12 ++++++------
 builder-support/post-build                    | 19 +++++++++++++++++++
 6 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100755 builder-support/post-build

diff --git a/.gitignore b/.gitignore
index a2c07bf039..4a0fbce403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ pdns_recursor.pid
 *.gcov
 modules/geoipbackend/regression-tests/GeoLiteCity.dat
 modules/geoipbackend/regression-tests/GeoLiteCity.mmdb
+built_pkgs
diff --git a/builder b/builder
index 620e8e7403..5181becf38 160000
--- a/builder
+++ b/builder
@@ -1 +1 @@
-Subproject commit 620e8e74032009c7044da7a1eb45c248fd89c778
+Subproject commit 5181becf38d564399e6ffaa8d041b123d8418f8c
diff --git a/builder-support/dockerfiles/Dockerfile.debbuild b/builder-support/dockerfiles/Dockerfile.debbuild
index aa391f24dc..3d3779118f 100644
--- a/builder-support/dockerfiles/Dockerfile.debbuild
+++ b/builder-support/dockerfiles/Dockerfile.debbuild
@@ -1,4 +1,4 @@
-@IF [ ! -z "$M_authoritative" ]
+@IF [ ! -z "$M_authoritative$M_all" ]
 RUN if $(echo ${BUILDER_VERSION} | grep -q -E '^0\.0\.'); then \
   # make sure we don't break dependencies for master releases \
   sed -i '/pdns-server (<< .*/d' pdns-${BUILDER_VERSION}/debian/control; \
@@ -9,13 +9,13 @@ RUN PDNS_TEST_NO_IPV6=1 builder/helpers/build-debs.sh pdns-${BUILDER_VERSION}
 RUN mv pdns*.deb /dist
 @ENDIF
 
-@IF [ ! -z "$M_recursor" ]
+@IF [ ! -z "$M_recursor$M_all" ]
 RUN builder/helpers/build-debs.sh pdns-recursor-${BUILDER_VERSION}
 
 RUN mv pdns-recursor*.deb /dist
 @ENDIF
 
-@IF [ ! -z "$M_dnsdist" ]
+@IF [ ! -z "$M_dnsdist$M_all" ]
 RUN builder/helpers/build-debs.sh dnsdist-${BUILDER_VERSION}
 
 RUN mv dnsdist*.deb /dist
diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 9709921340..021e996e17 100644
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -21,7 +21,7 @@ RUN for file in /sdist/* ; do ln -s $file /root/rpmbuild/SOURCES/ ; done && ls /
 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" ]
+@IF [ ! -z "$M_authoritative$M_all" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
       scl enable devtoolset-3 -- builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \
     else \
@@ -29,7 +29,7 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
     fi
 @ENDIF
 
-@IF [ ! -z "$M_recursor" ]
+@IF [ ! -z "$M_recursor$M_all" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
       scl enable devtoolset-3 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \
     else \
@@ -37,7 +37,7 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
     fi
 @ENDIF
 
-@IF [ ! -z "$M_dnsdist" ]
+@IF [ ! -z "$M_dnsdist$M_all" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
       scl enable devtoolset-3 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
     else \
diff --git a/builder-support/dockerfiles/Dockerfile.target.sdist b/builder-support/dockerfiles/Dockerfile.target.sdist
index 28bb3d468d..45c8da1aef 100644
--- a/builder-support/dockerfiles/Dockerfile.target.sdist
+++ b/builder-support/dockerfiles/Dockerfile.target.sdist
@@ -1,25 +1,25 @@
-@IF [ ! -z "$M_authoritative" ]
+@IF [ ! -z "$M_authoritative$M_all" ]
 @INCLUDE Dockerfile.authoritative
 @ENDIF
 
-@IF [ ! -z "$M_recursor" ]
+@IF [ ! -z "$M_recursor$M_all" ]
 @INCLUDE Dockerfile.recursor
 @ENDIF
 
-@IF [ ! -z "$M_dnsdist" ]
+@IF [ ! -z "$M_dnsdist$M_all" ]
 @INCLUDE Dockerfile.dnsdist
 @ENDIF
 
 FROM alpine:3.6 as sdist
 
-@IF [ ! -z "$M_authoritative" ]
+@IF [ ! -z "$M_authoritative$M_all" ]
 COPY --from=pdns-authoritative /sdist/ /sdist/
 @ENDIF
 
-@IF [ ! -z "$M_recursor" ]
+@IF [ ! -z "$M_recursor$M_all" ]
 COPY --from=pdns-recursor /sdist/ /sdist/
 @ENDIF
 
-@IF [ ! -z "$M_dnsdist" ]
+@IF [ ! -z "$M_dnsdist$M_all" ]
 COPY --from=dnsdist /sdist/ /sdist/
 @ENDIF
diff --git a/builder-support/post-build b/builder-support/post-build
new file mode 100755
index 0000000000..aefc896926
--- /dev/null
+++ b/builder-support/post-build
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+SRCDIR="${BUILDER_TMP}/${BUILDER_VERSION}/${BUILDER_TARGET}"
+DESTDIR="built_pkgs/"
+
+mkdir -p ${DESTDIR}
+
+for prog in pdns-recursor dnsdist pdns; do
+  if [ $(find ${SRCDIR}/dist -name "${prog}*" 2>/dev/null | wc -l) -ne 0 ]; then
+    dst=${DESTDIR}/${prog}/${BUILDER_VERSION}
+    mkdir -p ${dst}
+    cp ${BUILDER_TMP}/${BUILDER_VERSION}/sdist/${prog}*.tar.bz2 ${dst}
+    if [ "${prog}" = "pdns" ]; then
+      rm -f ${dst}/pdns-recursor*
+    fi
+    tardirname=${prog}-${BUILDER_VERSION}-${BUILDER_TARGET}
+    tar -cjf ${dst}/${tardirname}.tar.bz2 --transform="s,.*/,${tardirname}/,g"  $(find ${SRCDIR} -type f)
+  fi
+done
-- 
2.47.2