From 7b53ae3b078c391dcf27936ef91cd5bc19772368 Mon Sep 17 00:00:00 2001
From: Kalimuthu-Velappan
 <53821802+Kalimuthu-Velappan@users.noreply.github.com>
Date: Mon, 20 Apr 2020 18:14:25 +0000
Subject: [PATCH] [build]: DPKG caching fix for evaluation bugs (#4425)

Added DPKG support for ICCPD package
Added warning support for missing dependency files that causes the incorrect SHA generation.
---
 Makefile.cache         | 10 ++++++++--
 rules/docker-iccpd.dep | 11 +++++++++++
 rules/iccpd.dep        | 10 ++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 rules/docker-iccpd.dep
 create mode 100644 rules/iccpd.dep

diff --git a/Makefile.cache b/Makefile.cache
index 78ee4541a8..9e075e2db6 100644
--- a/Makefile.cache
+++ b/Makefile.cache
@@ -172,8 +172,14 @@ define GET_MOD_DEP_SHA
                             $(if $($(dfile)_MAIN_DEB),$($(dfile)_MAIN_DEB),$(dfile))) )
 
 	$(if $(MDEBUG), $(info $(1)_MOD_DEP_PKGS: $($(1)_MOD_DEP_PKGS)))
-	$(eval $(1)_DEP_MOD_SHA := $(shell git hash-object  \
-                            $(foreach dfile,$($(1)_MOD_DEP_PKGS), $($(dfile)_DEP_FLAGS_FILE) $($(dfile)_MOD_HASH_FILE) $($(dfile)_SMOD_HASH_FILE) ) \
+
+	# Warn if there is any missing dependency files
+	$(eval $(1)_DEP_MOD_SHA_FILES := $(foreach dfile,$($(1)_MOD_DEP_PKGS), \
+	                        $($(dfile)_DEP_FLAGS_FILE) $($(dfile)_MOD_HASH_FILE) $($(dfile)_SMOD_HASH_FILE)) )
+	$(eval $(1)_DEP_FILES_MISSING := $(filter-out $(wildcard $($(1)_DEP_MOD_SHA_FILES)),$($(1)_DEP_MOD_SHA_FILES)) )
+	$(if $($(1)_DEP_FILES_MISSING), $(warning "[ DPKG ] Dependecy file(s) are not found for $(1) : $($(1)_DEP_FILES_MISSING)))
+	
+	$(eval $(1)_DEP_MOD_SHA := $(shell git hash-object  $($(1)_DEP_MOD_SHA_FILES) \
                             | sha1sum | awk '{print substr($$1,0,23);}'))
 endef
 
diff --git a/rules/docker-iccpd.dep b/rules/docker-iccpd.dep
new file mode 100644
index 0000000000..878d1711c3
--- /dev/null
+++ b/rules/docker-iccpd.dep
@@ -0,0 +1,11 @@
+
+DPATH       := $($(DOCKER_ICCPD)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/docker-iccpd.mk rules/docker-iccpd.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_ICCPD)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(DOCKER_ICCPD)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_ICCPD)_DEP_FILES   := $(DEP_FILES)
+
+$(eval $(call add_dbg_docker,$(DOCKER_ICCPD),$(DOCKER_ICCPD_DBG)))
diff --git a/rules/iccpd.dep b/rules/iccpd.dep
new file mode 100644
index 0000000000..124cc5e421
--- /dev/null
+++ b/rules/iccpd.dep
@@ -0,0 +1,10 @@
+
+SPATH       := $($(ICCPD)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/iccpd.mk rules/iccpd.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(SPATH))
+
+$(ICCPD)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(ICCPD)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(ICCPD)_DEP_FILES   := $(DEP_FILES)
+