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.

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

spdk: compile for arm64 #15

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 0 additions & 13 deletions .github/workflows/poc-storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/opi-storage-${{ matrix.package }}

- name: Build and push Docker image
if: matrix.package != 'spdk'
uses: docker/build-push-action@175d02bffea74695e96b351069ac938b338802f9
with:
context: ${{ matrix.package }}
Expand All @@ -57,18 +56,6 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build and push Docker image
if: matrix.package == 'spdk'
uses: docker/build-push-action@175d02bffea74695e96b351069ac938b338802f9
with:
context: ${{ matrix.package }}
platforms: linux/amd64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

docker-build:
runs-on: ubuntu-latest
steps:
Expand Down
12 changes: 8 additions & 4 deletions spdk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
FROM docker.io/library/fedora:37 as build

ARG TAG=v22.09
# Pick an arch that has at least sse 4.2 but does not require newer avx
# See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
ARG ARCH=x86-64-v2

WORKDIR /root
RUN dnf install -y git rpm-build diffutils procps-ng pip && dnf clean all
Expand All @@ -15,8 +12,15 @@ RUN dnf install -y git rpm-build diffutils procps-ng pip && dnf clean all
RUN git clone https://github.com/spdk/spdk --branch ${TAG} --depth 1 && \
cd spdk && git submodule update --init --depth 1 && scripts/pkgdep.sh --rdma

ENV GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS 8

# hadolint ignore=DL3003
RUN cd spdk && ./rpmbuild/rpm.sh --target-arch=${ARCH} --without-uring --with-crypto \
RUN if [ "$(uname -m)" = "aarch64" ]; then \
ARCH="generic"; \
elif [ "$(uname -m)" = "x86_64" ]; then \
ARCH="x86-64-v2"; \
fi; \
cd spdk && ./rpmbuild/rpm.sh --target-arch=${ARCH} --without-uring --with-crypto \
--without-fio --with-raid5f --with-vhost --without-pmdk --without-rbd \
--with-rdma --with-shared --with-iscsi-initiator --without-vtune

Expand Down