File tree Expand file tree Collapse file tree 3 files changed +29
-2
lines changed
Expand file tree Collapse file tree 3 files changed +29
-2
lines changed Original file line number Diff line number Diff line change @@ -172,8 +172,14 @@ define GET_MOD_DEP_SHA
172172 $(if $($(dfile)_MAIN_DEB),$($(dfile)_MAIN_DEB),$(dfile))) )
173173
174174 $(if $(MDEBUG), $(info $(1)_MOD_DEP_PKGS: $($(1)_MOD_DEP_PKGS)))
175- $(eval $(1)_DEP_MOD_SHA := $(shell git hash-object \
176- $(foreach dfile,$($(1)_MOD_DEP_PKGS), $($(dfile)_DEP_FLAGS_FILE) $($(dfile)_MOD_HASH_FILE) $($(dfile)_SMOD_HASH_FILE) ) \
175+
176+ # Warn if there is any missing dependency files
177+ $(eval $(1)_DEP_MOD_SHA_FILES := $(foreach dfile,$($(1)_MOD_DEP_PKGS), \
178+ $($(dfile)_DEP_FLAGS_FILE) $($(dfile)_MOD_HASH_FILE) $($(dfile)_SMOD_HASH_FILE)) )
179+ $(eval $(1)_DEP_FILES_MISSING := $(filter-out $(wildcard $($(1)_DEP_MOD_SHA_FILES)),$($(1)_DEP_MOD_SHA_FILES)) )
180+ $(if $($(1)_DEP_FILES_MISSING), $(warning "[ DPKG ] Dependecy file(s) are not found for $(1) : $($(1)_DEP_FILES_MISSING)))
181+
182+ $(eval $(1)_DEP_MOD_SHA := $(shell git hash-object $($(1)_DEP_MOD_SHA_FILES) \
177183 | sha1sum | awk '{print substr($$1,0,23);}'))
178184endef
179185
Original file line number Diff line number Diff line change 1+
2+ DPATH := $($(DOCKER_ICCPD)_PATH)
3+ DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/docker-iccpd.mk rules/docker-iccpd.dep
4+ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
5+ DEP_FILES += $(shell git ls-files $(DPATH))
6+
7+ $(DOCKER_ICCPD)_CACHE_MODE := GIT_CONTENT_SHA
8+ $(DOCKER_ICCPD)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
9+ $(DOCKER_ICCPD)_DEP_FILES := $(DEP_FILES)
10+
11+ $(eval $(call add_dbg_docker,$(DOCKER_ICCPD),$(DOCKER_ICCPD_DBG)))
Original file line number Diff line number Diff line change 1+
2+ SPATH := $($(ICCPD)_SRC_PATH)
3+ DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/iccpd.mk rules/iccpd.dep
4+ DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
5+ DEP_FILES += $(shell git ls-files $(SPATH))
6+
7+ $(ICCPD)_CACHE_MODE := GIT_CONTENT_SHA
8+ $(ICCPD)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
9+ $(ICCPD)_DEP_FILES := $(DEP_FILES)
10+
You can’t perform that action at this time.
0 commit comments