From 6c85ce02bd72ec39ac50ffd271fe36f52714ffe2 Mon Sep 17 00:00:00 2001 From: Petr Fedchenkov Date: Tue, 22 Nov 2022 10:41:21 +0300 Subject: [PATCH] Do not force pkg build by default Let's make FORCE_BUILD flag optional and rely on hash provided by linuxkit on changes (https://github.com/linuxkit/linuxkit/pull/3875). With no flag provided linuxkit will check that image published, if not, will build it. This way we can avoid building of dependencies as well. Signed-off-by: Petr Fedchenkov --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3994b0205b..ecbd3841b2 100644 --- a/Makefile +++ b/Makefile @@ -267,7 +267,8 @@ LINUXKIT_OPTS=$(if $(strip $(EVE_HASH)),--hash) $(EVE_HASH) $(if $(strip $(EVE_R LINUXKIT_PKG_TARGET=build LINUXKIT_PATCHES_DIR=tools/linuxkit/patches RESCAN_DEPS=FORCE -FORCE_BUILD=--force +# set FORCE_BUILD to --force to enforce rebuild +FORCE_BUILD= # we use the following block to assign correct tag to the Docker registry artifact ifeq ($(LINUXKIT_PKG_TARGET),push) @@ -584,7 +585,6 @@ $(LIVE).parallels: $(LIVE).raw # top-level linuxkit packages targets, note the one enforcing ordering between packages pkgs: RESCAN_DEPS= -pkgs: FORCE_BUILD= pkgs: build-tools $(PKGS) @echo Done building packages