From 5d753e4071319d9d6c2800621d1b452b59823d43 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Wed, 29 Jun 2022 14:08:38 +1000
Subject: [PATCH] MDEV-28153: use static control dependencies adjusted by
 autobake-deb.sh

Closes: #MariaDB/mariadb.org-tools/pull/130
---
 ci_build_images/debian.Dockerfile | 41 ++++++-------------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile
index e68c7f67d..1e96e3c5f 100644
--- a/ci_build_images/debian.Dockerfile
+++ b/ci_build_images/debian.Dockerfile
@@ -23,40 +23,15 @@ RUN if grep -q "ID=debian" /etc/os-release; then \
 # see: https://cryptography.io/en/latest/installation/
 RUN apt-get update \
     && apt-get -y upgrade \
-    && apt-get -y install --no-install-recommends curl ca-certificates devscripts equivs \
+    && apt-get -y install --no-install-recommends curl devscripts equivs lsb-release \
     && curl -skO https://raw.githubusercontent.com/MariaDB/server/$mariadb_branch/debian/control \
-    # MDEV-27965 - temporary hack to introduce a late libfmt dependency, so \
-    # the main branches don't immediately fail on autobake builders once \
-    # https://github.com/MariaDB/server/pull/2062 is merged. \
-    && sed -i -e '/libedit-dev:native/a\\               libfmt-dev (>= 7.0.0),' control \
-    # skip unavailable deps on Debian 9 \
-    && if grep -q 'stretch' /etc/apt/sources.list; then \
-        sed '/libfmt-dev/d' -i control; \
-        sed '/libpmem-dev/d' -i control; \
-        sed '/liburing-dev/d' -i control; \
-        sed '/libzstd-dev/d' -i control; \
-    fi \
-    # skip unavailable deps on Debian 10 \
-    && if grep -q 'buster' /etc/apt/sources.list; then \
-        # libpmem-dev is not available on buster ARM/PPC \
-        if [ "$(uname -m)" != "x86_64" ]; then \
-            sed '/libpmem-dev/d' -i control; \
-        fi; \
-        sed '/libfmt-dev/d' -i control; \
-        sed '/liburing-dev/d' -i control; \
-    fi \
-    # skip unavailable deps on Ubuntu 18.04 \
-    && if grep -q 'bionic' /etc/apt/sources.list; then \
-        sed '/libfmt-dev/d' -i control; \
-        sed '/libpmem-dev/d' -i control; \
-        sed '/liburing-dev/d' -i control; \
-    fi \
-    # skip unavailable deps on Ubuntu 20.04 \
-    && if grep -q 'focal' /etc/apt/sources.list; then \
-        sed '/libfmt-dev/d' -i control; \
-        sed '/liburing-dev/d' -i control; \
-    fi \
-    && mk-build-deps -r -i control \
+    && mkdir debian \
+    && mv control debian/control \
+    && touch debian/rules VERSION debian/not-installed \
+    && curl -skO https://raw.githubusercontent.com/MariaDB/server/$mariadb_branch/debian/autobake-deb.sh \
+    && chmod a+x autobake-deb.sh \
+    && AUTOBAKE_PREP_CONTROL_RULES_ONLY=1 ./autobake-deb.sh \
+    && mk-build-deps -r -i debian/control \
     -t 'apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends' \
     && apt-get -y build-dep -q mariadb-server \
     && apt-get -y install --no-install-recommends \