matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[build]: Fix for missing dependencies in the DPKG framework (#6393)

Browse Source 
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.
This commit is contained in:
Kalimuthu-Velappan 2021-01-14 00:02:42 +05:30 committed by Guohan Lu
parent 43c25d6283
commit e6de7d3286
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/vs/rules.dep
View File

@ -2,6 +2,7 @@ include $(PLATFORM_PATH)/syncd-vs.dep
include $(PLATFORM_PATH)/sonic-version.dep include $(PLATFORM_PATH)/sonic-version.dep
include $(PLATFORM_PATH)/docker-sonic-vs.dep include $(PLATFORM_PATH)/docker-sonic-vs.dep
include $(PLATFORM_PATH)/docker-syncd-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)/one-image.dep
include $(PLATFORM_PATH)/onie.dep include $(PLATFORM_PATH)/onie.dep
include $(PLATFORM_PATH)/kvm-image.dep include $(PLATFORM_PATH)/kvm-image.dep

1
rules/functions
View File

@ -117,6 +117,7 @@ define add_dbg_docker
$(2)_PATH = $($(1)_PATH) $(2)_PATH = $($(1)_PATH)
$(2)_DBG_DEPENDS += $($(1)_DBG_DEPENDS) $(2)_DBG_DEPENDS += $($(1)_DBG_DEPENDS)
$(2)_DBG_IMAGE_PACKAGES += $($(1)_DBG_IMAGE_PACKAGES) $(2)_DBG_IMAGE_PACKAGES += $($(1)_DBG_IMAGE_PACKAGES)
$(2)_PYTHON_DEBS += $($(1)_PYTHON_DEBS)
$(2)_PYTHON_WHEELS += $($(1)_PYTHON_WHEELS) $(2)_PYTHON_WHEELS += $($(1)_PYTHON_WHEELS)
$(2)_LOAD_DOCKERS += $($(1)_LOAD_DOCKERS) $(2)_LOAD_DOCKERS += $($(1)_LOAD_DOCKERS)
$(2)_CACHE_MODE += $($(1)_CACHE_MODE) $(2)_CACHE_MODE += $($(1)_CACHE_MODE)

2
rules/sonic-platform-common.dep
View File

@ -2,7 +2,7 @@
SPATH := $($(SONIC_PLATFORM_COMMON_PY2)_SRC_PATH) 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_FILES_LIST) rules/sonic-platform-common.mk rules/sonic-platform-common.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) 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)_CACHE_MODE := GIT_CONTENT_SHA
$(SONIC_PLATFORM_COMMON_PY2)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(SONIC_PLATFORM_COMMON_PY2)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)

2
rules/sonic-ztp.dep
View File

@ -2,7 +2,7 @@
SPATH := $($(SONIC_ZTP)_SRC_PATH) SPATH := $($(SONIC_ZTP)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-ztp.mk rules/sonic-ztp.dep DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-ztp.mk rules/sonic-ztp.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) 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 $(SONIC_ZTP)_CACHE_MODE := GIT_CONTENT_SHA