From aaf253a2d7f3517365b0eeefe3734dbc52c47ec2 Mon Sep 17 00:00:00 2001
From: Bo Chen <chen.bo@intel.com>
Date: Mon, 25 Oct 2021 21:11:18 -0700
Subject: [PATCH] Dockerfile: Enforce to build SPDK with meson 0.59.2

This is to workaround a regression of building SPDK/DPDK with the latest
meson 0.60.0 [1][2].

[1] https://github.com/spdk/spdk/issues/2214
[2] https://bugs.dpdk.org/show_bug.cgi?id=836

Signed-off-by: Bo Chen <chen.bo@intel.com>
---
 resources/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/Dockerfile b/resources/Dockerfile
index ef6060ba8..fd9757213 100644
--- a/resources/Dockerfile
+++ b/resources/Dockerfile
@@ -117,6 +117,8 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
        && cd spdk \
        && git checkout a827fd7eeca67209d4c0aaad9a3ed55692e7e36e \
        && git submodule update --init \
+       && sed -i 's/pip3 install meson/pip3 install meson==0.59.2/g'  scripts/pkgdep/ubuntu.sh \
+       && sed -i 's/meson/meson==0.59.2/g'  scripts/pkgdep/requirements.txt \
        && apt-get update \
        && ./scripts/pkgdep.sh \
        && ./configure --with-vfio-user \