From 5c9c0b6e6284192a29afd159fe6b740315087c5e Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Thu, 4 Nov 2021 16:28:08 +0000 Subject: [PATCH] build: Fix default target Fixed the top-level build which was broken: the kata deploy Makefile was being sourced, but it was defining the first target, which became the default. Signed-off-by: James O. D. Hunt --- Makefile | 6 ++++-- utils.mk | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 77267f1864..aa8ee4816d 100644 --- a/Makefile +++ b/Makefile @@ -17,11 +17,13 @@ TOOLS += agent-ctl STANDARD_TARGETS = build check clean install test vendor -include utils.mk -include ./tools/packaging/kata-deploy/local-build/Makefile +default: all all: build +include utils.mk +include ./tools/packaging/kata-deploy/local-build/Makefile + # Create the rules $(eval $(call create_all_rules,$(COMPONENTS),$(TOOLS),$(STANDARD_TARGETS))) diff --git a/utils.mk b/utils.mk index 5ee04bf88f..7ace929745 100644 --- a/utils.mk +++ b/utils.mk @@ -91,8 +91,6 @@ endef # $3 - List of standard targets. define create_all_rules -default: all - all: $(1) $(2) # Create rules for all components.