Skip to content

Commit 1a62e24

Browse files
[build] Fix cache caculation, by adding _FILES to cache dependency file list. (#15473)
Why I did it When SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT changed, almost all dockers need to be built again. But currently it will be loaded by cache. Work item tracking Microsoft ADO (number only): 25123348 How I did it Add $(DOCKER)_FILES into dependencies.
1 parent 4b3fe70 commit 1a62e24

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Makefile.cache

+4-2
Original file line numberDiff line numberDiff line change
@@ -564,10 +564,12 @@ ALL_DEP_FILES_LIST += $(foreach pkg,$(2), $($(filter none,$($(1)_CACHE_MODE)), \
564564
$(addsuffix .$(3).sha,$(addprefix $(pkg)/, $(1)))))
565565
$(foreach docker, $(filter $(SONIC_DOCKER_IMAGES), $(1)), \
566566
$(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \
567-
$(wildcard files/build/versions/dockers/$(basename $(docker))/*)))
567+
$(wildcard files/build/versions/dockers/$(basename $(docker))/*) \
568+
$(foreach docker_file, $($(docker)_FILES), $(addprefix $(if $($(docker_file)_PATH), $($(docker_file)_PATH), $(FILES_PATH))/, $(docker_file))) ))
568569
$(foreach docker, $(filter $(SONIC_DOCKER_DBG_IMAGES), $(1)), \
569570
$(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \
570-
$(wildcard files/build/versions/dockers/$(patsubst %-$(DBG_IMAGE_MARK).gz,%,$(docker))/*)))
571+
$(wildcard files/build/versions/dockers/$(patsubst %-$(DBG_IMAGE_MARK).gz,%,$(docker))/*) \
572+
$(foreach docker_file, $($(docker)_FILES), $(addprefix $(if $($(docker_file)_PATH), $($(docker_file)_PATH), $(FILES_PATH))/, $(docker_file))) ))
571573
$(addsuffix .$(3),$(addprefix $(2)/, $(1))) : $(2)/%.$(3) : \
572574
$(2)/%.flags $$$$($$$$*_DEP_FILES) $$$$(if $$$$($$$$*_SMDEP_FILES), $(2)/%.smdep)
573575
@$$(eval $$*_DEP_FILES_MODIFIED := $$? )

rules/docker-eventd.mk

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_EVENTD)
3030
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_EVENTD_DBG)
3131
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_EVENTD_DBG)
3232

33+
$(DOCKER_EVENTD)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
3334
$(DOCKER_EVENTD)_CONTAINER_NAME = eventd
3435
$(DOCKER_EVENTD)_RUN_OPT += --privileged -t
3536
$(DOCKER_EVENTD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

0 commit comments

Comments
 (0)