From: Nick Porter Date: Thu, 8 Jan 2026 11:14:22 +0000 (+0000) Subject: Address debian sid package build issues X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a0d2384ccb5f3cf276b23e999d3c8e005f73634;p=thirdparty%2Ffreeradius-server.git Address debian sid package build issues --- diff --git a/scripts/docker/m4/crossbuild.deb.m4 b/scripts/docker/m4/crossbuild.deb.m4 index c5e73b8a6d0..407adbc3e1a 100644 --- 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 0eaeb3c5841..d46d482702f 100644 --- 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