Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change sairedis commit ID to latest #180

Merged
merged 3 commits into from
Aug 17, 2023
Merged

Change sairedis commit ID to latest #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0f8acc
Change sairedis commit to latest master
yuriilisovskyi Aug 15, 2023
62a6bce
Fix for image build
yuriilisovskyi Aug 17, 2023
3a2b863
Add changes for PHY build
yuriilisovskyi Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions npu/broadcom/BCM56850/saivs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
yuriilisovskyi marked this conversation as resolved.
Show resolved Hide resolved
yuriilisovskyi marked this conversation as resolved.
Show resolved Hide resolved
&& cd .. \
&& dpkg -i libsaimetadata_1.0.0_amd64.deb \
&& dpkg -i libsaimetadata-dev_1.0.0_amd64.deb \
Expand Down
3 changes: 1 addition & 2 deletions npu/broadcom/BCM56850/saivs/Dockerfile.saithrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions npu/broadcom/BCM56850/saivs/Dockerfile.server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions phy/broadcom/BCM81724/saivs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions phy/broadcom/BCM81724/saivs/Dockerfile.saithrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions phy/broadcom/BCM81724/saivs/Dockerfile.server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions sai.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down