[202205][BRCM_SAI] update Brcm SAI dependencies (#11173)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
sonic-net · Jun 17, 2022 · 95dc2e2 · 95dc2e2
1 parent 90e56cc
commit 95dc2e2
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/platform/broadcom/docker-pde.mk b/platform/broadcom/docker-pde.mk
@@ -6,7 +6,7 @@ DOCKER_PDE = $(DOCKER_PDE_STEM).gz
 DOCKER_PDE_DBG = $(DOCKER_PDE_STEM)-$(DBG_IMAGE_MARK).gz
 $(DOCKER_PDE)_PATH = $(DOCKERS_PATH)/$(DOCKER_PDE_STEM)
 $(DOCKER_PDE)_DEPENDS += $(PYTHON_NETIFACES)
-$(DOCKER_PDE)_DEPENDS += $(SONIC_PLATFORM_PDE) $(BRCM_SAI)
+$(DOCKER_PDE)_DEPENDS += $(SONIC_PLATFORM_PDE) $(BRCM_XGS_SAI)
 
 $(DOCKER_PDE_RDEPENDS += $(PYTHON_NETIFACES)
 $(DOCKER_PDE)_PYTHON_DEBS += $(SONIC_UTILS)

diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk
@@ -1,10 +1,11 @@
 # docker image for brcm syncd
+th modified:   platform/broadcom/sai.mk
 
 DOCKER_SYNCD_PLATFORM_CODE = brcm
 include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
 
 $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
-$(DOCKER_SYNCD_BASE)_DEPENDS += $(BRCM_SAI)
+$(DOCKER_SYNCD_BASE)_DEPENDS += $(BRCM_XGS_SAI)
 $(DOCKER_SYNCD_BASE)_FILES += $(DSSERVE) $(BCMCMD)
 
 $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \

diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk
@@ -13,8 +13,8 @@ else
 $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER)
 $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT)
 endif
-$(LIBSAITHRIFT_DEV)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)
-$(LIBSAITHRIFT_DEV)_RDEPENDS += $(BRCM_SAI)
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(BRCM_XGS_SAI) $(BRCM_XGS_SAI_DEV)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(BRCM_XGS_SAI)
 SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
 
 PYTHON_SAITHRIFT = python-saithrift$(SAITHRIFT_VER)_$(SAI_VER)_amd64.deb

diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
@@ -42,8 +42,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT_IMAGE) \
              $(DOCKER_FPM)
 
 # Inject brcm sai into syncd
-$(SYNCD)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)
-$(SYNCD)_UNINSTALLS += $(BRCM_SAI_DEV) $(BRCM_SAI)
+$(SYNCD)_DEPENDS += $(BRCM_XGS_SAI) $(BRCM_XGS_SAI_DEV)
+$(SYNCD)_UNINSTALLS += $(BRCM_XGS_SAI_DEV) $(BRCM_XGS_SAI)
 
 ifeq ($(ENABLE_SYNCD_RPC),y)
 $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)

diff --git a/platform/broadcom/sai.dep b/platform/broadcom/sai.dep
@@ -1,22 +1,22 @@
 
 #DPKG FRK
-SPATH       := $($(BRCM_SAI)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/broadcom/sai.mk platform/broadcom/sai.dep   
+SPATH       := $($(BRCM_XGS_SAI)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) platform/broadcom/sai.mk platform/broadcom/sai.dep
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 # Get the Latest HTTP Header and calculate the SHA value as it is a softlink that always points to LATEST_INT_OCP_SAI_X.X.X
-SAI_FLAGS   := $(shell wget --spider --server-response $($(BRCM_SAI)_URL) $($(BRCM_SAI_DEV)_URL)  2>&1 \
+SAI_FLAGS   := $(shell wget --spider --server-response $($(BRCM_XGS_SAI)_URL) $($(BRCM_XGS_SAI_DEV)_URL)  2>&1 \
 			   | grep -Ev -- '--|Date:|x-ms-request-id'|sha256sum|awk '{print $$1}' )
 
-$(BRCM_SAI)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(BRCM_SAI)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
-$(BRCM_SAI)_DEP_FILES   := $(DEP_FILES)
+$(BRCM_XGS_SAI)_CACHE_MODE  := GIT_CONTENT_SHA
+$(BRCM_XGS_SAI)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
+$(BRCM_XGS_SAI)_DEP_FILES   := $(DEP_FILES)
 
 
-$(BRCM_SAI_DEV)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(BRCM_SAI_DEV)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
-$(BRCM_SAI_DEV)_DEP_FILES   := $(DEP_FILES)
+$(BRCM_XGS_SAI_DEV)_CACHE_MODE  := GIT_CONTENT_SHA
+$(BRCM_XGS_SAI_DEV)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
+$(BRCM_XGS_SAI_DEV)_DEP_FILES   := $(DEP_FILES)
 
 # Dependencies for SAI DNX ASIC family
-$(BRCM_DNX_SAI)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(BRCM_DNX_SAI)_CACHE_MODE  := GIT_CONTENT_SHA
 $(BRCM_DNX_SAI)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
 $(BRCM_DNX_SAI)_DEP_FILES   := $(DEP_FILES)
diff --git a/platform/broadcom/sonic-pde-tests.mk b/platform/broadcom/sonic-pde-tests.mk
@@ -2,6 +2,6 @@
 
 SONIC_PLATFORM_PDE = sonic-platform-pde_1.0_amd64.deb
 $(SONIC_PLATFORM_PDE)_SRC_PATH = $(SRC_PATH)/sonic-platform-pde
-$(SONIC_PLATFORM_PDE)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV) $(SWIG)
+$(SONIC_PLATFORM_PDE)_DEPENDS += $(BRCM_XGS_SAI) $(BRCM_XGS_SAI_DEV) $(SWIG)
 
 SONIC_DPKG_DEBS += $(SONIC_PLATFORM_PDE)
diff --git a/platform/marvell/libsaithrift-dev.mk b/platform/marvell/libsaithrift-dev.mk
@@ -12,7 +12,7 @@ PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb
 $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
 
 SAISERVER = saiserver_$(SAI_VER)_amd64.deb
-$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_XGS_SAI)
 $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
 
 SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb