Skip to content

Commit

Permalink
[CENTEC ARM64]LIBSAIREDIS isn't depend on CENTEC_SAI, Remove this dep…
Browse files Browse the repository at this point in the history
…endency (sonic-net#5834)

* LIBSAIREDIS isn't depend on CENTEC_SAI remove this dependence

* Build depends are optimized in PR sonic-net#4880 and sonic-net#5039. Merge these optimization to Centec ARM64 platform.
  • Loading branch information
guxianghong authored and santhosh-kt committed Feb 25, 2021
1 parent 99c0688 commit 57a6f91
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
3 changes: 3 additions & 0 deletions platform/centec-arm64/docker-syncd-centec.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions platform/centec-arm64/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 1 addition & 0 deletions platform/centec-arm64/sai.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 57a6f91

Please sign in to comment.