From f26ff5edff9c2d2be6e90bbd5e07c257579bcf7c Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 11 Dec 2025 18:12:11 +0000 Subject: [PATCH] Upgrade SAI API from version 0.9.4 to 1.12 - Update SAI_VER to 1.12 in platform/vs/libsaithrift-dev.mk - Update SAI_VER to 1.12 in platform/mellanox/libsaithrift-dev.mk - Update SAI_VER to 1.12 in platform/barefoot/libsaithrift-dev.mk - Update MLNX_SAI_VERSION to SAIBuild2505.1.12.0 in platform/mellanox/mlnx-sai.mk - Update DPU_SAI_VERSION to SAIBuild1.12.0.0 in platform/nvidia-bluefield/recipes/dpu-sai.mk - Update LIBSAI_BRONCOS_VERSION to 1.12 in platform/components/docker-gbsyncd-broncos.mk - Update LIBSAIREDIS_VERSION to 1.12.0 in rules/sairedis.mk - Update SAI version comments in Dockerfile templates Co-Authored-By: Arthur Poon --- platform/barefoot/libsaithrift-dev.mk | 2 +- platform/components/docker-gbsyncd-broncos.mk | 4 ++-- platform/mellanox/libsaithrift-dev.mk | 2 +- platform/mellanox/mlnx-sai.mk | 2 +- platform/nvidia-bluefield/recipes/dpu-sai.mk | 2 +- platform/vs/libsaithrift-dev.mk | 2 +- rules/sairedis.mk | 2 +- sonic-slave-buster/Dockerfile.j2 | 2 +- sonic-slave-stretch/Dockerfile.j2 | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platform/barefoot/libsaithrift-dev.mk b/platform/barefoot/libsaithrift-dev.mk index a35cf13e5e2..158b8d73939 100644 --- a/platform/barefoot/libsaithrift-dev.mk +++ b/platform/barefoot/libsaithrift-dev.mk @@ -1,5 +1,5 @@ # libsaithrift-dev package -SAI_VER = 0.9.4 +SAI_VER = 1.12 LIBSAITHRIFT_DEV = libsaithrift$(SAITHRIFT_VER)-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_14_1) $(LIBTHRIFT_0_14_1_DEV) \ diff --git a/platform/components/docker-gbsyncd-broncos.mk b/platform/components/docker-gbsyncd-broncos.mk index 5ce094ae3c3..5df8577ab69 100644 --- a/platform/components/docker-gbsyncd-broncos.mk +++ b/platform/components/docker-gbsyncd-broncos.mk @@ -1,5 +1,5 @@ -LIBSAI_BRONCOS_VERSION = 3.12 -LIBSAI_BRONCOS_BRANCH_NAME = REL_3.12 +LIBSAI_BRONCOS_VERSION = 1.12 +LIBSAI_BRONCOS_BRANCH_NAME = REL_1.12 LIBSAI_BRONCOS_URL_PREFIX = "https://packages.trafficmanager.net/public/sai/bcmpai/$(LIBSAI_BRONCOS_BRANCH_NAME)/$(LIBSAI_BRONCOS_VERSION)" LIBSAI_BRONCOS = libsaibroncos_$(LIBSAI_BRONCOS_VERSION)_amd64.deb $(LIBSAI_BRONCOS)_URL = "$(LIBSAI_BRONCOS_URL_PREFIX)/$(LIBSAI_BRONCOS)" diff --git a/platform/mellanox/libsaithrift-dev.mk b/platform/mellanox/libsaithrift-dev.mk index 2bbff075fc8..6ff21527309 100644 --- a/platform/mellanox/libsaithrift-dev.mk +++ b/platform/mellanox/libsaithrift-dev.mk @@ -16,7 +16,7 @@ # # libsaithrift-dev package -SAI_VER = 0.9.4 +SAI_VER = 1.12 LIBSAITHRIFT_DEV = libsaithrift$(SAITHRIFT_VER)-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk index 542ec12fce1..3ea17d52c3f 100644 --- a/platform/mellanox/mlnx-sai.mk +++ b/platform/mellanox/mlnx-sai.mk @@ -1,6 +1,6 @@ # Mellanox SAI -MLNX_SAI_VERSION = SAIBuild2505.33.0.10 +MLNX_SAI_VERSION = SAIBuild2505.1.12.0 MLNX_SAI_ASSETS_GITHUB_URL = https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins MLNX_SAI_ASSETS_RELEASE_TAG = sai-$(MLNX_SAI_VERSION)-$(BLDENV)-$(CONFIGURED_ARCH) MLNX_SAI_ASSETS_URL = $(MLNX_SAI_ASSETS_GITHUB_URL)/releases/download/$(MLNX_SAI_ASSETS_RELEASE_TAG) diff --git a/platform/nvidia-bluefield/recipes/dpu-sai.mk b/platform/nvidia-bluefield/recipes/dpu-sai.mk index 724eefe50f7..b01532c9c95 100644 --- a/platform/nvidia-bluefield/recipes/dpu-sai.mk +++ b/platform/nvidia-bluefield/recipes/dpu-sai.mk @@ -15,7 +15,7 @@ # limitations under the License. # -DPU_SAI_VERSION = SAIBuild0.0.45.0 +DPU_SAI_VERSION = SAIBuild1.12.0.0 # Place here URL where SAI sources exist DPU_SAI_SOURCE_BASE_URL= diff --git a/platform/vs/libsaithrift-dev.mk b/platform/vs/libsaithrift-dev.mk index 5adf08c533a..ec201b4bc32 100644 --- a/platform/vs/libsaithrift-dev.mk +++ b/platform/vs/libsaithrift-dev.mk @@ -1,6 +1,6 @@ # libsaithrift-dev package -SAI_VER = 0.9.4 +SAI_VER = 1.12 LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI diff --git a/rules/sairedis.mk b/rules/sairedis.mk index b4ae9cfb447..dbb7986cf32 100644 --- a/rules/sairedis.mk +++ b/rules/sairedis.mk @@ -1,6 +1,6 @@ # sairedis package -LIBSAIREDIS_VERSION = 1.0.0 +LIBSAIREDIS_VERSION = 1.12.0 LIBSAIREDIS_NAME = libsairedis LIBSAIREDIS = $(LIBSAIREDIS_NAME)_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 4dcfda112e6..9959009c285 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -348,7 +348,7 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install # For iptables libnetfilter-conntrack-dev \ libnftnl-dev \ -# For SAI3.7 +# For SAI1.12 protobuf-compiler \ libprotobuf-dev \ libgrpc++-dev \ diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index c716cb998e0..232bc9072cb 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -251,7 +251,7 @@ RUN apt-get update && apt-get install -y \ # For iptables libnetfilter-conntrack-dev \ libnftnl-dev \ -# For SAI3.7 +# For SAI1.12 protobuf-compiler \ libprotobuf-dev \ xxd \