From 233e46a17f93a646ef270dd9338be1781fa8f5c2 Mon Sep 17 00:00:00 2001 From: shilongliu Date: Fri, 17 Jun 2022 14:28:40 +0800 Subject: [PATCH 1/2] [build] Add version files to docker image dependencies --- Makefile.cache | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.cache b/Makefile.cache index 50fac768a599..4ddb6cb6233c 100644 --- a/Makefile.cache +++ b/Makefile.cache @@ -561,6 +561,10 @@ define SHA_DEP_RULES ALL_DEP_FILES_LIST += $(foreach pkg,$(2), $($(filter none,$($(1)_CACHE_MODE)), \ $(addsuffix .$(3),$(addprefix $(pkg)/, $(1))) \ $(addsuffix .$(3).sha,$(addprefix $(pkg)/, $(1))))) +$(if $(filter $(SONIC_DOCKER_IMAGES) $(SONIC_DOCKER_DBG_IMAGES), $(1)), \ + $(foreach docker, $(1), \ + $(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \ + $(wildcard files/build/versions/dockers/$(subst -dbg,,$(basename $(docker)))/*)))) $(addsuffix .$(3),$(addprefix $(2)/, $(1))) : $(2)/%.$(3) : \ $(2)/%.flags $$$$($$$$*_DEP_FILES) $$$$(if $$$$($$$$*_SMDEP_FILES), $(2)/%.smdep) @$$(eval $$*_DEP_FILES_MODIFIED := $$? ) From b755908c9e975a094c7b972baf8bbb85ca6b208f Mon Sep 17 00:00:00 2001 From: shilongliu Date: Fri, 17 Jun 2022 16:14:44 +0800 Subject: [PATCH 2/2] fix --- Makefile.cache | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.cache b/Makefile.cache index 4ddb6cb6233c..9b6d6175780e 100644 --- a/Makefile.cache +++ b/Makefile.cache @@ -561,10 +561,12 @@ define SHA_DEP_RULES ALL_DEP_FILES_LIST += $(foreach pkg,$(2), $($(filter none,$($(1)_CACHE_MODE)), \ $(addsuffix .$(3),$(addprefix $(pkg)/, $(1))) \ $(addsuffix .$(3).sha,$(addprefix $(pkg)/, $(1))))) -$(if $(filter $(SONIC_DOCKER_IMAGES) $(SONIC_DOCKER_DBG_IMAGES), $(1)), \ - $(foreach docker, $(1), \ +$(foreach docker, $(filter $(SONIC_DOCKER_IMAGES), $(1)), \ $(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \ - $(wildcard files/build/versions/dockers/$(subst -dbg,,$(basename $(docker)))/*)))) + $(wildcard files/build/versions/dockers/$(basename $(docker))/*))) +$(foreach docker, $(filter $(SONIC_DOCKER_DBG_IMAGES), $(1)), \ + $(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \ + $(wildcard files/build/versions/dockers/$(patsubst %-$(DBG_IMAGE_MARK).gz,%,$(docker))/*))) $(addsuffix .$(3),$(addprefix $(2)/, $(1))) : $(2)/%.$(3) : \ $(2)/%.flags $$$$($$$$*_DEP_FILES) $$$$(if $$$$($$$$*_SMDEP_FILES), $(2)/%.smdep) @$$(eval $$*_DEP_FILES_MODIFIED := $$? )