From df21e15148ca7ad8b617a7f3471314591672fefa Mon Sep 17 00:00:00 2001 From: Bo Chen Date: Mon, 13 Dec 2021 10:04:23 -0800 Subject: [PATCH] Dockerfile: Update version of SPDK in container This patch also removes the workaround of building SPDK with meson 0.59.2 as the bug has been fixed [1]. [1] https://review.spdk.io/gerrit/c/spdk/dpdk/+/10044 Signed-off-by: Bo Chen --- resources/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/Dockerfile b/resources/Dockerfile index 598ae27fe..6dafd0b71 100644 --- a/resources/Dockerfile +++ b/resources/Dockerfile @@ -115,10 +115,8 @@ RUN git clone --depth 1 https://gitlab.com/virtio-fs/qemu.git -b qemu5.0-virtiof RUN if [ "$TARGETARCH" = "amd64" ]; then \ git clone https://github.com/spdk/spdk \ && cd spdk \ - && git checkout a827fd7eeca67209d4c0aaad9a3ed55692e7e36e \ + && git checkout 59f3cdacb13bd2a19c4a86be04792b0ee4491172 \ && 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 \