Skip to content

Commit 57a6f91

Browse files
guxianghongsanthosh-kt
authored andcommitted
[CENTEC ARM64]LIBSAIREDIS isn't depend on CENTEC_SAI, Remove this dependency (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.
1 parent 99c0688 commit 57a6f91

3 files changed

Lines changed: 11 additions & 2 deletions

File tree

platform/centec-arm64/docker-syncd-centec.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
1010
$(LIBSAIMETADATA_DBG) \
1111
$(LIBSAIREDIS_DBG)
1212

13+
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
14+
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
15+
1316
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
1417
$(DOCKER_SYNCD_CENTEC)_RUN_OPT += --privileged -t
1518
$(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf

platform/centec-arm64/rules.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
1111
$(DOCKER_FPM)
1212
# $(DOCKER_SYNCD_CENTEC_RPC)
1313

14-
# Inject centec sai into sairedis
15-
$(LIBSAIREDIS)_DEPENDS += $(CENTEC_SAI) $(LIBSAITHRIFT_DEV_CENTEC)
14+
# Inject centec sai into syncd
15+
$(SYNCD)_DEPENDS += $(CENTEC_SAI)
16+
$(SYNCD)_UNINSTALLS += $(CENTEC_SAI)
17+
18+
ifeq ($(ENABLE_SYNCD_RPC),y)
19+
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
20+
endif
1621

1722
# Runtime dependency on centec sai is set only for syncd
1823
$(SYNCD)_RDEPENDS += $(CENTEC_SAI)

platform/centec-arm64/sai.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ export CENTEC_SAI_VERSION = 1.6.3-1
44
export CENTEC_SAI = libsai_$(CENTEC_SAI_VERSION)_$(PLATFORM_ARCH).deb
55

66
$(CENTEC_SAI)_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/$(PLATFORM_ARCH)/sai/$(CENTEC_SAI)
7+
$(eval $(call add_conflict_package,$(CENTEC_SAI),$(LIBSAIVS_DEV)))
78
SONIC_ONLINE_DEBS += $(CENTEC_SAI)
89

0 commit comments

Comments
 (0)