github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 15:32:30 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs:skip the build process when the arch is s390x

Browse Source 
github.com/kata-containers/tests#4986.To avoid returning an error when running the ci, we just skip the build
process if the arch is s390x

Fixes: #4816
Signed-off-by: Zhongtao Hu <zhongtaohu.tim@linux.alibaba.com>
This commit is contained in:
Zhongtao Hu 2022-08-04 14:34:59 +08:00
parent 8b0e1859cb
commit 945e02227c
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/runtime-rs/Makefile
View File

@ -21,6 +21,16 @@ ARCH_DIR = arch
ARCH_FILE_SUFFIX = -options.mk ARCH_FILE_SUFFIX = -options.mk
ARCH_FILE = $(ARCH_DIR)/$(ARCH)$(ARCH_FILE_SUFFIX) ARCH_FILE = $(ARCH_DIR)/$(ARCH)$(ARCH_FILE_SUFFIX)
ifeq ($(ARCH), s390x)
##TARGET default: build code
default:
@echo "s390x not support currently"
exit 0
else
default: runtime show-header
endif
ifeq (,$(realpath $(ARCH_FILE))) ifeq (,$(realpath $(ARCH_FILE)))
$(error "ERROR: invalid architecture: '$(ARCH)'") $(error "ERROR: invalid architecture: '$(ARCH)'")
else else
@ -327,9 +337,6 @@ endef
.DEFAULT_GOAL := default .DEFAULT_GOAL := default
##TARGET default: build code
default: runtime show-header
runtime: $(TARGET) runtime: $(TARGET)
$(TARGET): $(GENERATED_CODE) $(TARGET_PATH) $(TARGET): $(GENERATED_CODE) $(TARGET_PATH)

15
src/runtime-rs/arch/s390x-options.mk Normal file
View File

@ -0,0 +1,15 @@
# Copyright (c) 2019-2022 Alibaba Cloud
# Copyright (c) 2019-2022 Ant Group
#
# SPDX-License-Identifier: Apache-2.0
#
MACHINETYPE :=
KERNELPARAMS :=
MACHINEACCELERATORS :=
CPUFEATURES := pmu=off
QEMUCMD := qemu-system-s390x
# dragonball binary name
DBCMD := dragonball