Address debian sid package build issues

diff --git a/scripts/docker/m4/crossbuild.deb.m4 b/scripts/docker/m4/crossbuild.deb.m4
index c5e73b8a6d01a5a0a068a4009080b4460a11f39c..407adbc3e1a2aac42cda71259a6431a6cc20b4c6 100644 (file)
--- a/scripts/docker/m4/crossbuild.deb.m4
+++ b/scripts/docker/m4/crossbuild.deb.m4
@@ -110,12 +110,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 ; \

diff --git a/scripts/docker/m4/docker.deb.m4 b/scripts/docker/m4/docker.deb.m4
index 0eaeb3c58415ed2e9f01dfa1241239c5bb93db87..d46d482702f6bcff9f5e6d9bb00602e6d8b9fb71 100644 (file)
--- a/scripts/docker/m4/docker.deb.m4
+++ b/scripts/docker/m4/docker.deb.m4
@@ -37,8 +37,12 @@ RUN git clean -fdxx \
 
 #
 #  Install build dependencies
+#  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.
 #
 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