From f1b9ccabdda4ddbe805b5aa79dc7aeaa745c878f Mon Sep 17 00:00:00 2001 From: Shu0T1an ChenG Date: Tue, 25 Jul 2017 19:03:48 -0700 Subject: [PATCH] [Broadcom]: Update the docker-syncd-rpc Makefile and Dockerfile This is a temporary fix for unblocking COPP test. After libsaithrift is compatible with SAI v1.0, this change needs to be reverted. --- platform/broadcom/docker-syncd-brcm-rpc.mk | 3 ++- platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/broadcom/docker-syncd-brcm-rpc.mk b/platform/broadcom/docker-syncd-brcm-rpc.mk index fa7c0fb797c7..bee2d284dcdd 100644 --- a/platform/broadcom/docker-syncd-brcm-rpc.mk +++ b/platform/broadcom/docker-syncd-brcm-rpc.mk @@ -2,7 +2,8 @@ DOCKER_SYNCD_BRCM_RPC = docker-syncd-brcm-rpc.gz $(DOCKER_SYNCD_BRCM_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-brcm-rpc -$(DOCKER_SYNCD_BRCM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) +# FIXME: Swap SYNCD to SYNCD_RPC after libsaithrift is compatible with SAI v1.0 +$(DOCKER_SYNCD_BRCM_RPC)_DEPENDS += $(SYNCD) $(LIBTHRIFT) $(DOCKER_SYNCD_BRCM_RPC)_FILES += $(DSSERVE) $(BCMCMD) $(DOCKER_SYNCD_BRCM_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BRCM) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM_RPC) diff --git a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 index ebe3dda1c14d..c9093f9b316d 100644 --- a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 +++ b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 @@ -9,13 +9,14 @@ debs/{{ deb }}{{' '}} {%- endfor -%} debs/ -RUN dpkg -P syncd - RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \ {% for deb in docker_syncd_brcm_rpc_debs.split(' ') -%} dpkg_apt debs/{{ deb }}{{'; '}} {%- endfor %} +# FIXME: Uncomment this line after libsaithrift is compatible with SAI v1.0 +# RUN dpkg -P syncd + ## Pre-install the fundamental packages RUN apt-get update \ && apt-get -y install \