mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-06-28 16:27:50 +00:00
Merge pull request #10921 from RuoqingHe/drop-redundant-override
build: Drop redundant ARCH override
This commit is contained in:
commit
e09ae2cc0b
@ -53,10 +53,6 @@ endif
|
|||||||
|
|
||||||
include ../../utils.mk
|
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
|
||||||
|
|
||||||
|
@ -17,10 +17,6 @@ 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)
|
||||||
|
@ -5,10 +5,6 @@
|
|||||||
|
|
||||||
include ../../../utils.mk
|
include ../../../utils.mk
|
||||||
|
|
||||||
ifeq ($(ARCH), ppc64le)
|
|
||||||
override ARCH = powerpc64le
|
|
||||||
endif
|
|
||||||
|
|
||||||
.DEFAULT_GOAL := default
|
.DEFAULT_GOAL := default
|
||||||
default: build
|
default: build
|
||||||
|
|
||||||
|
@ -6,10 +6,6 @@
|
|||||||
|
|
||||||
include ../../../utils.mk
|
include ../../../utils.mk
|
||||||
|
|
||||||
ifeq ($(ARCH), ppc64le)
|
|
||||||
override ARCH = powerpc64le
|
|
||||||
endif
|
|
||||||
|
|
||||||
COMMIT_HASH := $(shell git rev-parse HEAD 2>/dev/null || true)
|
COMMIT_HASH := $(shell git rev-parse HEAD 2>/dev/null || true)
|
||||||
# appends '-dirty' to the commit hash if there are uncommitted changes
|
# appends '-dirty' to the commit hash if there are uncommitted changes
|
||||||
COMMIT_INFO := $(if $(shell git status --porcelain --untracked-files=no 2>/dev/null || true),${COMMIT_HASH}-dirty,${COMMIT_HASH})
|
COMMIT_INFO := $(if $(shell git status --porcelain --untracked-files=no 2>/dev/null || true),${COMMIT_HASH}-dirty,${COMMIT_HASH})
|
||||||
|
@ -8,10 +8,6 @@ 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
|
||||||
|
@ -5,10 +5,6 @@
|
|||||||
|
|
||||||
include ../../../utils.mk
|
include ../../../utils.mk
|
||||||
|
|
||||||
ifeq ($(ARCH), ppc64le)
|
|
||||||
override ARCH = powerpc64le
|
|
||||||
endif
|
|
||||||
|
|
||||||
.DEFAULT_GOAL := default
|
.DEFAULT_GOAL := default
|
||||||
default: build
|
default: build
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user