s390x: build fedora binaries for peerpod

Fixes: confidential-containers#1640 Signed-off-by: Qi Feng Huo <[email protected]>
huoqifeng · Jan 9, 2024 · c111b3e · c111b3e
1 parent 06c32ca
commit c111b3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/podvm/Dockerfile.podvm_binaries.fedora b/podvm/Dockerfile.podvm_binaries.fedora
@@ -27,8 +27,10 @@ ENV ARCH ${ARCH}
 ENV IMAGE_URL "none"
 ENV IMAGE_CHECKSUM "none"
 
+RUN rm -rf cloud-api-adaptor && \
+ git clone -b fedora-s390x https://github.com/huoqifeng/cloud-api-adaptor.git
 RUN cd cloud-api-adaptor/podvm && \
- LIBC=gnu make binaries
+ RUST_FLAGS="ARCH=s390x CC=s390x-linux-gnu-gcc" make binaries
 
 FROM scratch
 COPY --from=podvm_builder /src/cloud-api-adaptor/podvm/files /
diff --git a/podvm/Makefile.inc b/podvm/Makefile.inc
@@ -119,7 +119,7 @@ $(PROCESS_USER_DATA): always
  install -D --compare "$(ROOT_DIR)/process-user-data" "$@"
 
 $(KATA_AGENT): $(FORCE_TARGET) | $(STATIC_LIBSECCOMP)
- cd "$(KATA_AGENT_SRC)" && $(RUST_FLAGS) $(MAKE) BUILD_TYPE=$(KATA_AGENT_BUILD_TYPE) SEALED_SECRET=${SEALED_SECRET} LIBSECCOMP_LINK_TYPE=static LIBSECCOMP_LIB_PATH=$(dir $(STATIC_LIBSECCOMP))
+ cd "$(KATA_AGENT_SRC)" && $(RUST_FLAGS) $(MAKE) LIBC=gnu BUILD_TYPE=$(KATA_AGENT_BUILD_TYPE) SEALED_SECRET=${SEALED_SECRET} LIBSECCOMP_LINK_TYPE=static LIBSECCOMP_LIB_PATH=$(dir $(STATIC_LIBSECCOMP))
  install -D --compare "$(KATA_AGENT_SRC)/target/$(RUST_TARGET)/$(KATA_AGENT_BUILD_TYPE)/$(@F)" "$@"
 
 $(STATIC_LIBSECCOMP): $(KATA_CONTAINERS_SRC)