builder: Begin with dnsdist rpms

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
new file mode 100644 (file)
index 0000000..ab7a335
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -0,0 +1,21 @@
+FROM alpine:3.6 as dnsdist
+
+RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
+                       libtool file boost-dev ragel py-virtualenv
+RUN apk add --no-cache \
+                       libedit-dev
+
+ADD builder/helpers/set-configure-ac-version.sh /dnsdist/builder/helpers/
+@EXEC sdist_dirs=(build-aux m4 pdns ext)
+@EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /dnsdist/$d/" ; done
+WORKDIR /dnsdist/pdns/dnsdistdist
+
+RUN mkdir /sdist
+
+ARG BUILDER_VERSION
+RUN /dnsdist/builder/helpers/set-configure-ac-version.sh && \
+     autoreconf -v -i --force && \
+    ./configure --disable-dependency-tracking && \
+    make dist
+RUN cp dnsdist-${BUILDER_VERSION}.tar.bz2 /sdist/
+

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 677c2b22c88a72629b6a192214a6783065cec5a7..3e060c611becc10a26f426fbad290bc5a7d2a82c 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -29,6 +29,14 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
     fi
 @ENDIF
 
+@IF [ ! -z "$M_dnsdist" ]
+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 \
+      builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
+    fi
+@ENDIF
+
 # mv accross layers with overlay2 is buggy in some kernel versions (results in empty dirs)
 # See: https://github.com/moby/moby/issues/33733
 #RUN mv /root/rpmbuild/RPMS/* /dist/

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index c7c563c7daef2b7ed41911f8bb30aca7246c30c8..9eda0d5017049954eaef3334e2a623b4945d6462 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -51,9 +51,7 @@ EXTRA_DIST=dnslabeltext.rl \
           README.md \
           delaypipe.cc delaypipe.hh \
           html \
-          .version \
           contrib \
-          build-aux/gen-version \
           ext/incbin/UNLICENSE \
           incfiles \
           src_js \

diff --git a/pdns/dnsdistdist/build-aux/gen-version b/pdns/dnsdistdist/build-aux/gen-version
index 65e37dfd1d1db00d0046b2d0385bc9b1409ced68..68c709be98c29ae133a041502f22cb28394afd97 120000 (symlink)
--- a/pdns/dnsdistdist/build-aux/gen-version
+++ b/pdns/dnsdistdist/build-aux/gen-version
@@ -1 +1 @@
-../../../build-aux/gen-version
\ No newline at end of file
+../../../builder-support/gen-version
\ No newline at end of file

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 9bc010e3ff7a939f85c8b206c46bdf2a9a1777a9..3c7084b882ad8df66812df6992bd7deaa75b60c0 100644 (file)
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.61])
 
 AC_INIT([dnsdist], m4_esyscmd(build-aux/gen-version))
-AM_INIT_AUTOMAKE([foreign dist-bzip2 parallel-tests 1.11 subdir-objects])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip parallel-tests 1.11 subdir-objects])
 AM_SILENT_RULES([yes])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])