diff --git a/platform/centec-arm64/libsaithrift-dev.mk b/platform/centec-arm64/libsaithrift-dev.mk index ff7fd9bc7..b742fda99 100755 --- a/platform/centec-arm64/libsaithrift-dev.mk +++ b/platform/centec-arm64/libsaithrift-dev.mk @@ -4,7 +4,7 @@ SAI_VER = 0.9.4 LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI -$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(CENTEC_SAI) $(LIBHIREDIS) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) +$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(CENTEC_SAI) $(CENTEC_SAI_DEV) $(LIBHIREDIS) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(CENTEC_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) diff --git a/platform/centec-arm64/rules.mk b/platform/centec-arm64/rules.mk index 9873e8b31..fe047bc48 100755 --- a/platform/centec-arm64/rules.mk +++ b/platform/centec-arm64/rules.mk @@ -12,8 +12,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \ # $(DOCKER_SYNCD_CENTEC_RPC) # Inject centec sai into syncd -$(SYNCD)_DEPENDS += $(CENTEC_SAI) -$(SYNCD)_UNINSTALLS += $(CENTEC_SAI) +$(SYNCD)_DEPENDS += $(CENTEC_SAI) $(CENTEC_SAI_DEV) +$(SYNCD)_UNINSTALLS += $(CENTEC_SAI_DEV) $(CENTEC_SAI) ifeq ($(ENABLE_SYNCD_RPC),y) $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV) diff --git a/platform/centec-arm64/sai.mk b/platform/centec-arm64/sai.mk index dbe94c5eb..82dc1de5e 100755 --- a/platform/centec-arm64/sai.mk +++ b/platform/centec-arm64/sai.mk @@ -2,8 +2,12 @@ export CENTEC_SAI_VERSION = 1.10.1-0 export CENTEC_SAI = libsai_$(CENTEC_SAI_VERSION)_$(PLATFORM_ARCH).deb +export CENTEC_SAI_DEV = libsai-dev_$(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) +$(CENTEC_SAI)_DEV_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/$(PLATFORM_ARCH)/sai/$(CENTEC_SAI_DEV) +$(eval $(call add_conflict_package,$(CENTEC_SAI_DEV),$(LIBSAIVS_DEV))) + +SONIC_ONLINE_DEBS += $(CENTEC_SAI) +SONIC_ONLINE_DEBS += $(CENTEC_SAI_DEV) diff --git a/platform/centec/libsaithrift-dev.mk b/platform/centec/libsaithrift-dev.mk index a58befacf..eccd73001 100644 --- a/platform/centec/libsaithrift-dev.mk +++ b/platform/centec/libsaithrift-dev.mk @@ -4,7 +4,7 @@ SAI_VER = 0.9.4 LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI -$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(CENTEC_SAI) $(LIBHIREDIS) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) +$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(CENTEC_SAI) $(CENTEC_SAI_DEV) $(LIBHIREDIS) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(CENTEC_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) diff --git a/platform/centec/rules.mk b/platform/centec/rules.mk index 5e207846f..2e8cdb0af 100644 --- a/platform/centec/rules.mk +++ b/platform/centec/rules.mk @@ -11,8 +11,8 @@ include $(PLATFORM_PATH)/libsaithrift-dev.mk SONIC_ALL += $(SONIC_ONE_IMAGE) # Inject centec sai into syncd -$(SYNCD)_DEPENDS += $(CENTEC_SAI) -$(SYNCD)_UNINSTALLS += $(CENTEC_SAI) +$(SYNCD)_DEPENDS += $(CENTEC_SAI) $(CENTEC_SAI_DEV) +$(SYNCD)_UNINSTALLS += $(CENTEC_SAI_DEV) $(CENTEC_SAI) ifeq ($(ENABLE_SYNCD_RPC),y) $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV) diff --git a/platform/centec/sdk.mk b/platform/centec/sdk.mk index 668fde390..7fe7122a4 100644 --- a/platform/centec/sdk.mk +++ b/platform/centec/sdk.mk @@ -1,6 +1,10 @@ # Centec SAI CENTEC_SAI = libsai_1.10.1-0_amd64.deb $(CENTEC_SAI)_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/sai/$(CENTEC_SAI) -$(eval $(call add_conflict_package,$(CENTEC_SAI),$(LIBSAIVS_DEV))) + +CENTEC_SAI_DEV = libsai-dev_1.10.1-0_amd64.deb +$(CENTEC_SAI_DEV)_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/sai/$(CENTEC_SAI_DEV) +$(eval $(call add_conflict_package,$(CENTEC_SAI_DEV),$(LIBSAIVS_DEV))) SONIC_ONLINE_DEBS += $(CENTEC_SAI) +SONIC_ONLINE_DEBS += $(CENTEC_SAI_DEV)