Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202605 to 202607 #2873

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

Merged
mssonicbld merged 4 commits into from
Aug 7, 2026
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202605 to 202607 #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a4c10f
fix(docker-ptf): update grpc-go to 1.82.1 (#28853)
auspham Aug 5, 2026
0b2faef
[build] upgrade p4lang-p4c package version (#28851)
mssonicbld Aug 6, 2026
769e3d8
[submodule] Update submodule sonic-host-services to the latest HEAD a…
mssonicbld Aug 6, 2026
638c2f2
Merge branch '202605' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Aug 7, 2026
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
4 changes: 2 additions & 2 deletions dockers/docker-ptf/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ ENV PATH="/usr/local/go/bin:$HOME/go/bin:$PATH"
RUN GRPCURL_VERSION=v1.9.3 \
&& git clone --depth 1 --branch "${GRPCURL_VERSION}" https://github.com/fullstorydev/grpcurl.git /tmp/grpcurl \
&& cd /tmp/grpcurl \
&& go get google.golang.org/grpc@v1.79.3 \
&& go get google.golang.org/grpc@v1.82.1 \
&& go get github.com/go-jose/go-jose/v4@latest \
&& go get golang.org/x/crypto@latest golang.org/x/net@latest golang.org/x/text@latest golang.org/x/sys@latest golang.org/x/oauth2@latest \
&& go mod tidy \
Expand Down Expand Up @@ -218,7 +218,7 @@ debs/{{ deb }}{{' '}}
{% else %}
RUN apt-get update
# Install p4lang packages for DASH SAI support first and python-saithrift
RUN apt install -y --reinstall ./debs/p4lang-pi_0.1.1-1_amd64.deb ./debs/p4lang-bmv2_1.15.0-9_amd64.deb ./debs/p4lang-p4c_1.2.4.2-2_amd64.deb ./debs/python-saithrift_0.9.4_amd64.deb
RUN apt install -y --reinstall ./debs/p4lang-pi_0.1.1-1_amd64.deb ./debs/p4lang-bmv2_1.15.0-9_amd64.deb ./debs/p4lang-p4c_1.2.4.2-3_amd64.deb ./debs/python-saithrift_0.9.4_amd64.deb
{% endif %}


Expand Down
2 changes: 1 addition & 1 deletion rules/p4lang.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ SONIC_MAKE_DEBS += $(P4LANG_BMV2)
# p4lang-p4c

P4LANG_P4C_VERSION = 1.2.4.2
P4LANG_P4C_VERSION_FULL = $(P4LANG_P4C_VERSION)-2
P4LANG_P4C_VERSION_FULL = $(P4LANG_P4C_VERSION)-3

export P4LANG_P4C_VERSION
export P4LANG_P4C_VERSION_FULL
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-host-services
Open in desktop
Submodule sonic-host-services updated 1 files
+2 −2 data/debian/sonic-host-services-data.gnoi-shutdown.service
Loading