Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable VPCLMULQDQ when we build inside github #314

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Disable VPCLMULQDQ when we build inside github #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 5 additions & 1 deletion Dockerfile.spdk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ EOF

ARG SPDK_PKGDEP_ARGS \
SPDK_CONFIGURE_ARGS \
SPDK_MAKEFLAGS
SPDK_MAKEFLAGS \
SPDK_DISABLE_VPCLMULQDQ

WORKDIR /src
COPY . .
Expand All @@ -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

Expand Down
1 change: 1 addition & 0 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ services:
SPDK_DESCRIPTION:
SPDK_URL:
SPDK_MAINTAINER: $MAINTAINER
SPDK_DISABLE_VPCLMULQDQ:
BUILD_DATE:
SPDK_GIT_REPO:
SPDK_GIT_BRANCH:
Expand Down