Change sairedis commit ID to latest (#180)

Signed-off-by: Yurii Lisovskyi <yurii.lisovskyi@plvision.eu>
opencomputeproject · Aug 17, 2023 · 550e624 · 550e624
1 parent c945baa
commit 550e624
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git a/npu/broadcom/BCM56850/saivs/Dockerfile b/npu/broadcom/BCM56850/saivs/Dockerfile
@@ -27,8 +27,7 @@ RUN git clone https://github.com/sonic-net/sonic-sairedis.git \
         && find . -type f -name Makefile.am | xargs sed -ri 's/^TESTS =/# TESTS =/' \
         && sed -i "s/^SUBDIRS = py2 py3/SUBDIRS = py3/" pyext/Makefile.am \
         && ./autogen.sh \
-        && export DEB_BUILD_PROFILES=nopython2 \
-        && dpkg-buildpackage -us -uc -b --target=binary-syncd-vs --jobs=auto \
+        && dpkg-buildpackage -us -uc -b -Psyncd,vs,nopython2 --jobs=auto \
         && cd .. \
         && dpkg -i libsaimetadata_1.0.0_amd64.deb \
         && dpkg -i libsaimetadata-dev_1.0.0_amd64.deb \

diff --git a/npu/broadcom/BCM56850/saivs/Dockerfile.saithrift b/npu/broadcom/BCM56850/saivs/Dockerfile.saithrift
@@ -51,8 +51,7 @@ RUN git clone https://github.com/sonic-net/sonic-sairedis.git \
         && find . -type f -name Makefile.am | xargs sed -ri 's/^TESTS =/# TESTS =/' \
         && sed -i "s/^SUBDIRS = py2 py3/SUBDIRS = py3/" pyext/Makefile.am \
         && ./autogen.sh \
-        && export DEB_BUILD_PROFILES=nopython2 \
-        && dpkg-buildpackage -us -uc -b --target=binary-syncd-vs --jobs=auto \
+        && dpkg-buildpackage -us -uc -b -Psyncd,vs,nopython2 --jobs=auto \
         && cd .. \
         && dpkg -i libsaimetadata_1.0.0_amd64.deb \
         && dpkg -i libsaimetadata-dev_1.0.0_amd64.deb \

diff --git a/npu/broadcom/BCM56850/saivs/Dockerfile.server b/npu/broadcom/BCM56850/saivs/Dockerfile.server
@@ -22,8 +22,7 @@ RUN git clone https://github.com/sonic-net/sonic-sairedis.git \
         && find . -type f -name Makefile.am | xargs sed -ri 's/^TESTS =/# TESTS =/' \
         && sed -i "s/^SUBDIRS = py2 py3/SUBDIRS = py3/" pyext/Makefile.am \
         && ./autogen.sh \
-        && export DEB_BUILD_PROFILES=nopython2 \
-        && dpkg-buildpackage -us -uc -b --target=binary-syncd-vs --jobs=auto \
+        && dpkg-buildpackage -us -uc -b -Psyncd,vs,nopython2 --jobs=auto \
         && cd .. \
         && dpkg -i libsaimetadata_1.0.0_amd64.deb \
         && dpkg -i libsaimetadata-dev_1.0.0_amd64.deb \

diff --git a/phy/broadcom/BCM81724/saivs/Dockerfile b/phy/broadcom/BCM81724/saivs/Dockerfile
@@ -27,8 +27,7 @@ RUN git clone https://github.com/sonic-net/sonic-sairedis.git \
         && find . -type f -name Makefile.am | xargs sed -ri 's/^TESTS =/# TESTS =/' \
         && sed -i "s/^SUBDIRS = py2 py3/SUBDIRS = py3/" pyext/Makefile.am \
         && ./autogen.sh \
-        && export DEB_BUILD_PROFILES=nopython2 \
-        && dpkg-buildpackage -us -uc -b --target=binary-syncd-vs --jobs=auto \
+        && dpkg-buildpackage -us -uc -b -Psyncd,vs,nopython2 --jobs=auto \
         && cd .. \
         && dpkg -i libsaimetadata_1.0.0_amd64.deb \
         && dpkg -i libsaimetadata-dev_1.0.0_amd64.deb \

diff --git a/phy/broadcom/BCM81724/saivs/Dockerfile.saithrift b/phy/broadcom/BCM81724/saivs/Dockerfile.saithrift
@@ -51,8 +51,7 @@ RUN git clone https://github.com/sonic-net/sonic-sairedis.git \
         && find . -type f -name Makefile.am | xargs sed -ri 's/^TESTS =/# TESTS =/' \
         && sed -i "s/^SUBDIRS = py2 py3/SUBDIRS = py3/" pyext/Makefile.am \
         && ./autogen.sh \
-        && export DEB_BUILD_PROFILES=nopython2 \
-        && dpkg-buildpackage -us -uc -b --target=binary-syncd-vs --jobs=auto \
+        && dpkg-buildpackage -us -uc -b -Psyncd,vs,nopython2 --jobs=auto \
         && cd .. \
         && dpkg -i libsaimetadata_1.0.0_amd64.deb \
         && dpkg -i libsaimetadata-dev_1.0.0_amd64.deb \

diff --git a/phy/broadcom/BCM81724/saivs/Dockerfile.server b/phy/broadcom/BCM81724/saivs/Dockerfile.server
@@ -22,8 +22,7 @@ RUN git clone https://github.com/sonic-net/sonic-sairedis.git \
         && find . -type f -name Makefile.am | xargs sed -ri 's/^TESTS =/# TESTS =/' \
         && sed -i "s/^SUBDIRS = py2 py3/SUBDIRS = py3/" pyext/Makefile.am \
         && ./autogen.sh \
-        && export DEB_BUILD_PROFILES=nopython2 \
-        && dpkg-buildpackage -us -uc -b --target=binary-syncd-vs --jobs=auto \
+        && dpkg-buildpackage -us -uc -b -Psyncd,vs,nopython2 --jobs=auto \
         && cd .. \
         && dpkg -i libsaimetadata_1.0.0_amd64.deb \
         && dpkg -i libsaimetadata-dev_1.0.0_amd64.deb \

diff --git a/sai.env b/sai.env
@@ -1,10 +1,10 @@
 # The sonic-swss-common and sonic-sairedis commits were taken from
-# sonic-buildimage master as of May 22, 2023
+# sonic-buildimage master as of Aug 15, 2023
 #
-# https://github.com/sonic-net/sonic-buildimage/tree/c5f2a0e
+# https://github.com/sonic-net/sonic-buildimage/tree/4acaaf8
 
-SWSS_COMMON_ID=5f41f0d
-SAIREDIS_ID=606703e
+SWSS_COMMON_ID=be425ed
+SAIREDIS_ID=eb24302
 
 # SAI version:
 #   Branch v1.12