From 265a751837e87e576c9b28246d3cc2b2dbf45052 Mon Sep 17 00:00:00 2001 From: Ruoqing He Date: Mon, 24 Feb 2025 22:04:28 +0800 Subject: [PATCH] build: Drop redundant ARCH override There are many `override ARCH = powerpc64le` after where `utils.mk` is included, which are redundant. Drop those redundant `override`s. Signed-off-by: Ruoqing He --- src/agent/Makefile | 4 ---- src/runtime-rs/Makefile | 4 ---- src/tools/agent-ctl/Makefile | 4 ---- src/tools/genpolicy/Makefile | 4 ---- src/tools/runk/Makefile | 4 ---- src/tools/trace-forwarder/Makefile | 4 ---- 6 files changed, 24 deletions(-) diff --git a/src/agent/Makefile b/src/agent/Makefile index e62a894aa..2e51c3a11 100644 --- a/src/agent/Makefile +++ b/src/agent/Makefile @@ -53,10 +53,6 @@ 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 STANDARD_OCI_RUNTIME := no diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index 0bb0617ff..c4ad16a7e 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -17,10 +17,6 @@ CONTAINERD_RUNTIME_NAME = io.containerd.kata.v2 include ../../utils.mk -ifeq ($(ARCH), ppc64le) - override ARCH = powerpc64le -endif - ARCH_DIR = arch ARCH_FILE_SUFFIX = -options.mk ARCH_FILE = $(ARCH_DIR)/$(ARCH)$(ARCH_FILE_SUFFIX) diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile index a49f88e6b..980e47ccb 100644 --- a/src/tools/agent-ctl/Makefile +++ b/src/tools/agent-ctl/Makefile @@ -5,10 +5,6 @@ include ../../../utils.mk -ifeq ($(ARCH), ppc64le) - override ARCH = powerpc64le -endif - .DEFAULT_GOAL := default default: build diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile index 7410e20ed..532af7eec 100644 --- a/src/tools/genpolicy/Makefile +++ b/src/tools/genpolicy/Makefile @@ -6,10 +6,6 @@ include ../../../utils.mk -ifeq ($(ARCH), ppc64le) - override ARCH = powerpc64le - endif - COMMIT_HASH := $(shell git rev-parse HEAD 2>/dev/null || true) # 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}) diff --git a/src/tools/runk/Makefile b/src/tools/runk/Makefile index 186955679..d025b6a89 100644 --- a/src/tools/runk/Makefile +++ b/src/tools/runk/Makefile @@ -8,10 +8,6 @@ LIBC ?= gnu include ../../../utils.mk -ifeq ($(ARCH), ppc64le) - override ARCH = powerpc64le -endif - TARGET = runk TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET) AGENT_SOURCE_PATH = ../../agent diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile index 5d9f71856..5a529e211 100644 --- a/src/tools/trace-forwarder/Makefile +++ b/src/tools/trace-forwarder/Makefile @@ -5,10 +5,6 @@ include ../../../utils.mk -ifeq ($(ARCH), ppc64le) - override ARCH = powerpc64le -endif - .DEFAULT_GOAL := default default: build