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

[gbsyncd] Build docker-gbsyncd-broncos image (#11748)

Browse Source 
The libsaibroncos debian package is published at $(LIBSAI_BRONCOS)_URL. Enable building docker-gbsyncd-broncos image on PLATFORM broadcom.
This commit is contained in:
Junhua Zhai 2022-08-23 04:38:08 +00:00 committed by GitHub
parent 770cb80017
commit fb774dd46a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/broadcom/rules.dep
View File

@ -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.dep
include $(PLATFORM_PATH)/docker-syncd-brcm-dnx-rpc.dep include $(PLATFORM_PATH)/docker-syncd-brcm-dnx-rpc.dep
include $(PLATFORM_PATH)/../components/docker-gbsyncd-credo.dep include $(PLATFORM_PATH)/../components/docker-gbsyncd-credo.dep
ifeq ($(INCLUDE_GBSYNCD_BRONCOS), y)
include $(PLATFORM_PATH)/../components/docker-gbsyncd-broncos.dep include $(PLATFORM_PATH)/../components/docker-gbsyncd-broncos.dep
endif

2
platform/broadcom/rules.mk
View File

@ -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.mk
include $(PLATFORM_PATH)/docker-syncd-brcm-dnx-rpc.mk include $(PLATFORM_PATH)/docker-syncd-brcm-dnx-rpc.mk
include $(PLATFORM_PATH)/../components/docker-gbsyncd-credo.mk include $(PLATFORM_PATH)/../components/docker-gbsyncd-credo.mk
ifeq ($(INCLUDE_GBSYNCD_BRONCOS), y)
include $(PLATFORM_PATH)/../components/docker-gbsyncd-broncos.mk include $(PLATFORM_PATH)/../components/docker-gbsyncd-broncos.mk
endif
BCMCMD = bcmcmd 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" $(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"

7
platform/components/docker-gbsyncd-broncos.mk
View File

@ -1,5 +1,8 @@
LIBSAI_BRONCOS = libsaibroncos_0.0.1_amd64.deb LIBSAI_BRONCOS_VERSION = 3.8
$(LIBSAI_BRONCOS)_URL = LIBSAI_BRONCOS_BRANCH_NAME = REL_3.8
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)"
ifneq ($($(LIBSAI_BRONCOS)_URL),) ifneq ($($(LIBSAI_BRONCOS)_URL),)

2
platform/components/docker-gbsyncd-broncos/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM docker-config-engine-bullseye FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
ARG docker_container_name ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf