From e6de7d32863879acfadcc3abcec99ca62876dfc5 Mon Sep 17 00:00:00 2001
From: Kalimuthu-Velappan
 <53821802+Kalimuthu-Velappan@users.noreply.github.com>
Date: Thu, 14 Jan 2021 00:02:42 +0530
Subject: [PATCH] [build]: Fix for missing dependencies in the DPKG framework
 (#6393)

1. Fixes the missing DPKG file for gbsyncd-vs package
2. Fixes the softlink issue on the Platform-common and ztp package
3. Fixes the PYTHNON_DEBS list is missing for DBG dockers.
---
 platform/vs/rules.dep           | 1 +
 rules/functions                 | 1 +
 rules/sonic-platform-common.dep | 2 +-
 rules/sonic-ztp.dep             | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/vs/rules.dep b/platform/vs/rules.dep
index 7d36c819509e..7a5346619e70 100644
--- a/platform/vs/rules.dep
+++ b/platform/vs/rules.dep
@@ -2,6 +2,7 @@ include $(PLATFORM_PATH)/syncd-vs.dep
 include $(PLATFORM_PATH)/sonic-version.dep
 include $(PLATFORM_PATH)/docker-sonic-vs.dep
 include $(PLATFORM_PATH)/docker-syncd-vs.dep
+include $(PLATFORM_PATH)/docker-gbsyncd-vs.dep
 include $(PLATFORM_PATH)/one-image.dep
 include $(PLATFORM_PATH)/onie.dep
 include $(PLATFORM_PATH)/kvm-image.dep
diff --git a/rules/functions b/rules/functions
index 5ccb111cec72..35b63aeabaf7 100644
--- a/rules/functions
+++ b/rules/functions
@@ -117,6 +117,7 @@ define add_dbg_docker
 $(2)_PATH = $($(1)_PATH)
 $(2)_DBG_DEPENDS += $($(1)_DBG_DEPENDS)
 $(2)_DBG_IMAGE_PACKAGES += $($(1)_DBG_IMAGE_PACKAGES)
+$(2)_PYTHON_DEBS += $($(1)_PYTHON_DEBS)
 $(2)_PYTHON_WHEELS += $($(1)_PYTHON_WHEELS)
 $(2)_LOAD_DOCKERS += $($(1)_LOAD_DOCKERS)
 $(2)_CACHE_MODE += $($(1)_CACHE_MODE)
diff --git a/rules/sonic-platform-common.dep b/rules/sonic-platform-common.dep
index f93240135988..e921c4df01af 100644
--- a/rules/sonic-platform-common.dep
+++ b/rules/sonic-platform-common.dep
@@ -2,7 +2,7 @@
 SPATH       := $($(SONIC_PLATFORM_COMMON_PY2)_SRC_PATH)
 DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-platform-common.mk rules/sonic-platform-common.dep   
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "sonic_sfp|sonic_eeprom"))
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "^sonic_sfp|^sonic_eeprom"))
 
 $(SONIC_PLATFORM_COMMON_PY2)_CACHE_MODE  := GIT_CONTENT_SHA 
 $(SONIC_PLATFORM_COMMON_PY2)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
diff --git a/rules/sonic-ztp.dep b/rules/sonic-ztp.dep
index 32890c5d74b6..bf6622ddb505 100644
--- a/rules/sonic-ztp.dep
+++ b/rules/sonic-ztp.dep
@@ -2,7 +2,7 @@
 SPATH       := $($(SONIC_ZTP)_SRC_PATH)
 DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-ztp.mk rules/sonic-ztp.dep   
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "inband-ztp-ip|dhclient-exit-hooks.d/ztp"))
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "dhclient-enter-hooks.d|dhclient-exit-hooks.d"))
 
 
 $(SONIC_ZTP)_CACHE_MODE  := GIT_CONTENT_SHA