Update debian sid docker files

diff --git a/scripts/docker/build/debiansid/Dockerfile b/scripts/docker/build/debiansid/Dockerfile
index 25f608c22d913b08715f2ad855fec0c6e352079e..d6e3a2044ae166d63d05bcc1ebdd20e2207b5401 100644 (file)
--- a/scripts/docker/build/debiansid/Dockerfile
+++ b/scripts/docker/build/debiansid/Dockerfile
@@ -42,8 +42,12 @@ RUN git clean -fdxx \
 
 #
 #  Install build dependencies
+#  Debian sid fails if if debian/control doesn't exist due to an issue
+#  in one of the included make files, so we create a blank file.
 #
 RUN if [ -e ./debian/control.in ]; then \
+       touch debian/control; \
+       touch debian/control.in; \
         debian/rules debian/control; \
     fi; \
     echo 'y' | mk-build-deps -irt'apt-get -yV' debian/control

diff --git a/scripts/docker/build/debiansid/Dockerfile.cb b/scripts/docker/build/debiansid/Dockerfile.cb
index 8db8238c4797d0b04c0b40da1758eeca1d46c082..483af96e1ac4bebe3ec572b5a41316cd75a74c09 100644 (file)
--- a/scripts/docker/build/debiansid/Dockerfile.cb
+++ b/scripts/docker/build/debiansid/Dockerfile.cb
@@ -85,12 +85,16 @@ RUN git clone --depth 1 --no-single-branch ${source}
 
 #
 #  Install build dependencies for all branches from v4 onwards
+#  Debian sid fails if debian/control doesn't exist due to an issue
+#  in one of the included make files, so we create a blank file.
 #
 WORKDIR freeradius-server
 RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
     do \
         git checkout $i; \
         if [ -e ./debian/control.in ] ; then \
+           touch debian/control; \
+            touch debian/control.in; \
             debian/rules debian/control ; \
         fi ; \
         mk-build-deps -irt"apt-get -o Debug::pkgProblemResolver=yes $APT_OPTS" debian/control ; \