From fdaebba9cc6afac6fef5c2821994e6ea1020e7e2 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 9 May 2021 17:22:41 +0200
Subject: [PATCH] deps.sh: unify handling of special cases

---
 packaging/deps.sh                            | 1 -
 packaging/docker/Dockerfile.debian-multiarch | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/deps.sh b/packaging/deps.sh
index 0d2ffb1d1..a1960245c 100644
--- a/packaging/deps.sh
+++ b/packaging/deps.sh
@@ -135,7 +135,6 @@ fi
 
 # Build & Install uldaq
 if ! pkg-config "libuldaq >= 1.0.0" && \
-    [ "${DISTRO}" != "debian-multiarch" ] && \
     [ -z "${SKIP_ULDAQ}" ]; then
     git clone --branch rpmbuild --depth 1 https://github.com/stv0g/uldaq
     pushd uldaq
diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch
index 17310b596..c7c02c1e0 100644
--- a/packaging/docker/Dockerfile.debian-multiarch
+++ b/packaging/docker/Dockerfile.debian-multiarch
@@ -106,7 +106,8 @@ ENV TRIPLET=${TRIPLET}
 
 # Install unpackaged dependencies from source
 ADD packaging/deps.sh /
-RUN bash deps.sh
+RUN export SKIP_ULDAQ=1; \
+    bash deps.sh
 
 # Expose ports for HTTP and WebSocket frontend
 EXPOSE 80