External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dockerfile: Update version of SPDK in container

Browse Source 
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 <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2021-12-13 10:04:23 -08:00 committed by Sebastien Boeuf
parent 2883c71911
commit df21e15148
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/Dockerfile
View File

@ -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 \ RUN if [ "$TARGETARCH" = "amd64" ]; then \
git clone https://github.com/spdk/spdk \ git clone https://github.com/spdk/spdk \
&& cd spdk \ && cd spdk \
&& git checkout a827fd7eeca67209d4c0aaad9a3ed55692e7e36e \ && git checkout 59f3cdacb13bd2a19c4a86be04792b0ee4491172 \
&& git submodule update --init \ && 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 \ && apt-get update \
&& ./scripts/pkgdep.sh \ && ./scripts/pkgdep.sh \
&& ./configure --with-vfio-user \ && ./configure --with-vfio-user \