From 4c54233cb692c3ec2d5c831f3ac3353ddee0ed32 Mon Sep 17 00:00:00 2001 From: yoush Date: Tue, 14 Jun 2022 02:14:41 +0000 Subject: [PATCH 1/2] for add new reference to sai debian package of v1.9.1-1 --- platform/centec-arm64/libsaithrift-dev.mk | 2 +- platform/centec-arm64/rules.mk | 4 ++-- platform/centec-arm64/sai.mk | 9 ++++++--- platform/centec/libsaithrift-dev.mk | 2 +- platform/centec/rules.mk | 4 ++-- platform/centec/sdk.mk | 8 ++++++-- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/platform/centec-arm64/libsaithrift-dev.mk b/platform/centec-arm64/libsaithrift-dev.mk index ff7fd9bc70ec..b742fda99d6f 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 9873e8b31ceb..fe047bc48452 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 a6fd05c858c0..aea22bcff6a4 100755 --- a/platform/centec-arm64/sai.mk +++ b/platform/centec-arm64/sai.mk @@ -1,9 +1,12 @@ # Centec SAI -export CENTEC_SAI_VERSION = 1.9.1-0 +export CENTEC_SAI_VERSION = 1.9.1-1 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 a58befacfe43..eccd730018b5 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 5e207846f49a..2e8cdb0af9f6 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 2f56265b4890..25962d93a941 100644 --- a/platform/centec/sdk.mk +++ b/platform/centec/sdk.mk @@ -1,6 +1,10 @@ # Centec SAI -CENTEC_SAI = libsai_1.9.1-0_amd64.deb +CENTEC_SAI = libsai_1.9.1-1_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.9.1-1_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) From df69137bff7bd01e5e0af4318b81893ade7b9dad Mon Sep 17 00:00:00 2001 From: Xianghong Gu Date: Sat, 18 Jun 2022 04:49:09 +0000 Subject: [PATCH 2/2] [centec][arm64] fix a typo error in CENTEC_SAI_DEV URL --- platform/centec-arm64/sai.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/centec-arm64/sai.mk b/platform/centec-arm64/sai.mk index aea22bcff6a4..81e673b39989 100755 --- a/platform/centec-arm64/sai.mk +++ b/platform/centec-arm64/sai.mk @@ -5,7 +5,7 @@ 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) -$(CENTEC_SAI)_DEV_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/$(PLATFORM_ARCH)/sai/$(CENTEC_SAI_DEV) +$(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)