From 8ed348b506f7572780bc41dd812ff2b0691c65f6 Mon Sep 17 00:00:00 2001 From: Junhua Zhai Date: Tue, 16 Aug 2022 12:17:03 +0000 Subject: [PATCH 1/3] Build docker-gbsyncd-broncos image --- platform/broadcom/rules.dep | 2 -- platform/broadcom/rules.mk | 2 -- platform/components/docker-gbsyncd-broncos.mk | 7 +++++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/broadcom/rules.dep b/platform/broadcom/rules.dep index 220ee8019943..075636a8dedd 100644 --- a/platform/broadcom/rules.dep +++ b/platform/broadcom/rules.dep @@ -30,6 +30,4 @@ include $(PLATFORM_PATH)/libsaithrift-dev.dep include $(PLATFORM_PATH)/docker-syncd-brcm-dnx.dep include $(PLATFORM_PATH)/docker-syncd-brcm-dnx-rpc.dep include $(PLATFORM_PATH)/../components/docker-gbsyncd-credo.dep -ifeq ($(INCLUDE_GBSYNCD_BRONCOS), y) include $(PLATFORM_PATH)/../components/docker-gbsyncd-broncos.dep -endif diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk index 0b46bb1c8ec4..c43a66ee43e3 100644 --- a/platform/broadcom/rules.mk +++ b/platform/broadcom/rules.mk @@ -29,9 +29,7 @@ include $(PLATFORM_PATH)/libsaithrift-dev.mk include $(PLATFORM_PATH)/docker-syncd-brcm-dnx.mk include $(PLATFORM_PATH)/docker-syncd-brcm-dnx-rpc.mk include $(PLATFORM_PATH)/../components/docker-gbsyncd-credo.mk -ifeq ($(INCLUDE_GBSYNCD_BRONCOS), y) include $(PLATFORM_PATH)/../components/docker-gbsyncd-broncos.mk -endif BCMCMD = bcmcmd $(BCMCMD)_URL = "https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r" diff --git a/platform/components/docker-gbsyncd-broncos.mk b/platform/components/docker-gbsyncd-broncos.mk index 6e280ee5a655..147923cabf7a 100644 --- a/platform/components/docker-gbsyncd-broncos.mk +++ b/platform/components/docker-gbsyncd-broncos.mk @@ -1,5 +1,8 @@ -LIBSAI_BRONCOS = libsaibroncos_0.0.1_amd64.deb -$(LIBSAI_BRONCOS)_URL = +LIBSAI_BRONCOS_VERSION = 3.8 +LIBSAI_BRONCOS_BRANCH_NAME = REL_3.8 +LIBSAI_BRONCOS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmpai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)" +LIBSAI_BRONCOS = libsaibroncos_$(LIBSAI_BRONCOS_VERSION)_amd64.deb +$(LIBSAI_BRONCOS)_URL = "$(LIBSAI_BRONCOS_URL_PREFIX)/$(LIBSAI_BRONCOS)" ifneq ($($(LIBSAI_BRONCOS)_URL),) From 4043f11cd729f3473d49555778817b148d8130a0 Mon Sep 17 00:00:00 2001 From: Junhua Zhai Date: Thu, 18 Aug 2022 01:56:14 +0000 Subject: [PATCH 2/3] Correct typo in LIBSAI_BRONCOS_URL_PREFIX --- platform/components/docker-gbsyncd-broncos.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/components/docker-gbsyncd-broncos.mk b/platform/components/docker-gbsyncd-broncos.mk index 147923cabf7a..1aad33f9680d 100644 --- a/platform/components/docker-gbsyncd-broncos.mk +++ b/platform/components/docker-gbsyncd-broncos.mk @@ -1,6 +1,6 @@ LIBSAI_BRONCOS_VERSION = 3.8 LIBSAI_BRONCOS_BRANCH_NAME = REL_3.8 -LIBSAI_BRONCOS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmpai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)" +LIBSAI_BRONCOS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmpai/$(LIBSAI_BRONCOS_BRANCH_NAME)/$(LIBSAI_BRONCOS_VERSION)" LIBSAI_BRONCOS = libsaibroncos_$(LIBSAI_BRONCOS_VERSION)_amd64.deb $(LIBSAI_BRONCOS)_URL = "$(LIBSAI_BRONCOS_URL_PREFIX)/$(LIBSAI_BRONCOS)" From 438b57137450308261762625d87d0636d4c96e56 Mon Sep 17 00:00:00 2001 From: Junhua Zhai Date: Mon, 22 Aug 2022 14:24:49 +0000 Subject: [PATCH 3/3] Update docker-gbsyncd-broncos/Dockerfile.j2 --- platform/components/docker-gbsyncd-broncos/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/components/docker-gbsyncd-broncos/Dockerfile.j2 b/platform/components/docker-gbsyncd-broncos/Dockerfile.j2 index f114679c6888..154c7735ce97 100644 --- a/platform/components/docker-gbsyncd-broncos/Dockerfile.j2 +++ b/platform/components/docker-gbsyncd-broncos/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM docker-config-engine-bullseye +FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} ARG docker_container_name RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf