From 9329c4b987a10748fc724cead9d63863dbf694be Mon Sep 17 00:00:00 2001 From: Ying Xie <yxieca@users.noreply.github.com> Date: Thu, 16 Jun 2022 16:00:17 -0700 Subject: [PATCH] [202205][bcm sai] upgrade Broadcom SAI to 7.1.0.0-5 (#11159) * [bcm sai] upgrade Broadcom SAI to 7.1.0.0-5 - Enable Microsoft AN/LT patch Signed-off-by: Ying Xie <ying.xie@microsoft.com> --- platform/broadcom/sai.mk | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 876c7af838..f3f6448d2e 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,18 +1,20 @@ -LIBSAIBCM_VERSION = 7.1.0.0-1 +LIBSAIBCM_XGS_VERSION = 7.1.0.0-5 +LIBSAIBCM_DNX_VERSION = 7.1.0.0-1 LIBSAIBCM_BRANCH_NAME = REL_7.0 -LIBSAIBCM_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_VERSION)" +LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)" +LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)" -BRCM_SAI = libsaibcm_$(LIBSAIBCM_VERSION)_amd64.deb -$(BRCM_SAI)_URL = "$(LIBSAIBCM_URL_PREFIX)/$(BRCM_SAI)" -BRCM_SAI_DEV = libsaibcm-dev_$(LIBSAIBCM_VERSION)_amd64.deb -$(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) -$(BRCM_SAI_DEV)_URL = "$(LIBSAIBCM_URL_PREFIX)/$(BRCM_SAI_DEV)" +BRCM_XGS_SAI = libsaibcm_$(LIBSAIBCM_XGS_VERSION)_amd64.deb +$(BRCM_XGS_SAI)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_XGS_SAI)" +BRCM_XGS_SAI_DEV = libsaibcm-dev_$(LIBSAIBCM_XGS_VERSION)_amd64.deb +$(eval $(call add_derived_package,$(BRCM_XGS_SAI),$(BRCM_XGS_SAI_DEV))) +$(BRCM_XGS_SAI_DEV)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_XGS_SAI_DEV)" # SAI module for DNX Asic family -BRCM_DNX_SAI = libsaibcm_dnx_$(LIBSAIBCM_VERSION)_amd64.deb -$(BRCM_DNX_SAI)_URL = "$(LIBSAIBCM_URL_PREFIX)/$(BRCM_DNX_SAI)" +BRCM_DNX_SAI = libsaibcm_dnx_$(LIBSAIBCM_DNX_VERSION)_amd64.deb +$(BRCM_DNX_SAI)_URL = "$(LIBSAIBCM_DNX_URL_PREFIX)/$(BRCM_DNX_SAI)" -SONIC_ONLINE_DEBS += $(BRCM_SAI) +SONIC_ONLINE_DEBS += $(BRCM_XGS_SAI) SONIC_ONLINE_DEBS += $(BRCM_DNX_SAI) -$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI) -$(eval $(call add_conflict_package,$(BRCM_SAI_DEV),$(LIBSAIVS_DEV))) +$(BRCM_XGS_SAI_DEV)_DEPENDS += $(BRCM_XGS_SAI) +$(eval $(call add_conflict_package,$(BRCM_XGS_SAI_DEV),$(LIBSAIVS_DEV)))