diff --git a/.env b/.env index 64abbb2c..4bf858cc 100644 --- a/.env +++ b/.env @@ -50,6 +50,7 @@ SPDK_URL="https://spdk.io" SPDK_PKGDEP_ARGS="--rbd" SPDK_CONFIGURE_ARGS="--with-rbd --disable-tests --disable-unit-tests --disable-examples" SPDK_MAKEFLAGS= +SPDK_DISABLE_VPCLMULQDQ= SPDK_CENTOS_BASE="https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/Packages/" SPDK_CENTOS_REPO_VER="9.0-21.el9" diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 4aaa1949..884f44f7 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -23,7 +23,7 @@ jobs: submodules: recursive - name: Build container images - run: make build + run: make build SPDK_DISABLE_VPCLMULQDQ="yes" - name: Save container images run: | diff --git a/Dockerfile.spdk b/Dockerfile.spdk index 6b1e051c..ab46675b 100644 --- a/Dockerfile.spdk +++ b/Dockerfile.spdk @@ -24,7 +24,8 @@ EOF ARG SPDK_PKGDEP_ARGS \ SPDK_CONFIGURE_ARGS \ - SPDK_MAKEFLAGS + SPDK_MAKEFLAGS \ + SPDK_DISABLE_VPCLMULQDQ WORKDIR /src COPY . . @@ -45,6 +46,9 @@ RUN \ # Disable RDSEED, see https://github.com/ceph/ceph-nvmeof/issues/259 RUN \ sed -i "s/^\( \+'RDSEED'\)/#\1/" dpdk/config/x86/meson.build +# If we run from github disable also VPCLMULQDQ as some of github's runners don't have it +RUN \ + if [[ -n "$SPDK_DISABLE_VPCLMULQDQ" ]]; then sed -i "s/^\( \+'VPCLMULQDQ'\)/#\1/" dpdk/config/x86/meson.build ; fi RUN \ cat dpdk/config/x86/meson.build diff --git a/docker-compose.yaml b/docker-compose.yaml index 90025098..1781ecde 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -19,6 +19,7 @@ services: SPDK_DESCRIPTION: SPDK_URL: SPDK_MAINTAINER: $MAINTAINER + SPDK_DISABLE_VPCLMULQDQ: BUILD_DATE: SPDK_GIT_REPO: SPDK_GIT_BRANCH: