github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-27 07:48:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6742 from Amulyam24/agent-build

Browse Source 
runtime: remove overriding ARCH value by default for ppc64le
This commit is contained in:
Amulya Meka 2023-05-12 12:34:50 +05:30 committed by GitHub
commit 76f975e5e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/agent/Makefile
View File

@ -33,6 +33,12 @@ ifeq ($(SECCOMP),yes)
override EXTRA_RUSTFEATURES += seccomp override EXTRA_RUSTFEATURES += seccomp
endif endif
include ../../utils.mk
ifeq ($(ARCH), ppc64le)
override ARCH = powerpc64le
endif
##VAR STANDARD_OCI_RUNTIME=yes|no define if agent enables standard oci runtime feature ##VAR STANDARD_OCI_RUNTIME=yes|no define if agent enables standard oci runtime feature
STANDARD_OCI_RUNTIME := no STANDARD_OCI_RUNTIME := no
@ -45,8 +51,6 @@ ifneq ($(EXTRA_RUSTFEATURES),)
override EXTRA_RUSTFEATURES := --features "$(EXTRA_RUSTFEATURES)" override EXTRA_RUSTFEATURES := --features "$(EXTRA_RUSTFEATURES)"
endif endif
include ../../utils.mk
TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET) TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)
##VAR DESTDIR=<path> is a directory prepended to each installed target file ##VAR DESTDIR=<path> is a directory prepended to each installed target file

4
src/runtime-rs/Makefile
View File

@ -17,6 +17,10 @@ CONTAINERD_RUNTIME_NAME = io.containerd.kata.v2
include ../../utils.mk include ../../utils.mk
ifeq ($(ARCH), ppc64le)
override ARCH = powerpc64le
endif
ARCH_DIR = arch 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)

4
src/tools/agent-ctl/Makefile
View File

@ -5,6 +5,10 @@
include ../../../utils.mk include ../../../utils.mk
ifeq ($(ARCH), ppc64le)
override ARCH = powerpc64le
endif
.DEFAULT_GOAL := default .DEFAULT_GOAL := default
default: build default: build

4
src/tools/runk/Makefile
View File

@ -8,6 +8,10 @@ LIBC ?= gnu
include ../../../utils.mk include ../../../utils.mk
ifeq ($(ARCH), ppc64le)
override ARCH = powerpc64le
endif
TARGET = runk TARGET = runk
TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET) TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)
AGENT_SOURCE_PATH = ../../agent AGENT_SOURCE_PATH = ../../agent

4
src/tools/trace-forwarder/Makefile
View File

@ -5,6 +5,10 @@
include ../../../utils.mk include ../../../utils.mk
ifeq ($(ARCH), ppc64le)
override ARCH = powerpc64le
endif
.DEFAULT_GOAL := default .DEFAULT_GOAL := default
default: build default: build

1
utils.mk
View File

@ -146,7 +146,6 @@ ifneq ($(LIBC),musl)
endif endif
ifeq ($(ARCH), ppc64le) ifeq ($(ARCH), ppc64le)
override ARCH = powerpc64le
override LIBC = gnu override LIBC = gnu
$(warning "WARNING: powerpc64le-unknown-linux-musl target is unavailable") $(warning "WARNING: powerpc64le-unknown-linux-musl target is unavailable")
endif endif