From eeffbb24d9743b2b8922887f77736eef2de5b18e Mon Sep 17 00:00:00 2001
From: guxianghong <gxh2001757@163.com>
Date: Mon, 16 Nov 2020 20:15:25 +0800
Subject: [PATCH] [CENTEC ARM64]LIBSAIREDIS isn't depend on CENTEC_SAI, Remove
 this dependency (#5834)

* LIBSAIREDIS isn't depend on CENTEC_SAI remove this dependence

* Build depends are optimized in PR #4880 and #5039. Merge these optimization to Centec ARM64 platform.
---
 platform/centec-arm64/docker-syncd-centec.mk | 3 +++
 platform/centec-arm64/rules.mk               | 9 +++++++--
 platform/centec-arm64/sai.mk                 | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/platform/centec-arm64/docker-syncd-centec.mk b/platform/centec-arm64/docker-syncd-centec.mk
index 9c3d1b1aff..9943420660 100755
--- a/platform/centec-arm64/docker-syncd-centec.mk
+++ b/platform/centec-arm64/docker-syncd-centec.mk
@@ -10,6 +10,9 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSAIMETADATA_DBG) \
                                 $(LIBSAIREDIS_DBG)
 
+SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
+SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
+
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/centec-arm64/rules.mk b/platform/centec-arm64/rules.mk
index a168692c8b..79e1ab12b8 100755
--- a/platform/centec-arm64/rules.mk
+++ b/platform/centec-arm64/rules.mk
@@ -11,8 +11,13 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM)
 #             $(DOCKER_SYNCD_CENTEC_RPC)
 
-# Inject centec sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(CENTEC_SAI) $(LIBSAITHRIFT_DEV_CENTEC)
+# Inject centec sai into syncd
+$(SYNCD)_DEPENDS += $(CENTEC_SAI)
+$(SYNCD)_UNINSTALLS += $(CENTEC_SAI)
+
+ifeq ($(ENABLE_SYNCD_RPC),y)
+$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
+endif
 
 # Runtime dependency on centec sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(CENTEC_SAI)
diff --git a/platform/centec-arm64/sai.mk b/platform/centec-arm64/sai.mk
index 7d9c997efa..2b902b4940 100755
--- a/platform/centec-arm64/sai.mk
+++ b/platform/centec-arm64/sai.mk
@@ -4,5 +4,6 @@ export CENTEC_SAI_VERSION = 1.6.3-1
 export CENTEC_SAI = libsai_$(CENTEC_SAI_VERSION)_$(PLATFORM_ARCH).deb
 
 $(CENTEC_SAI)_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/$(PLATFORM_ARCH)/sai/$(CENTEC_SAI)
+$(eval $(call add_conflict_package,$(CENTEC_SAI),$(LIBSAIVS_DEV)))
 SONIC_ONLINE_DEBS += $(CENTEC_SAI)