Skip to content

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

Merged
mssonicbld merged 4 commits into
Azure:202607from
mssonicbld:sonicbld/202607-merge
Aug 7, 2026
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202605 to 202607#2873
mssonicbld merged 4 commits into
Azure:202607from
mssonicbld:sonicbld/202607-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* 0b2faef94 - (head/202605) [build] upgrade p4lang-p4c package version (#28851) (2026-08-06) [mssonicbld]
* 0a4c10fa8 - fix(docker-ptf): update grpc-go to 1.82.1 (#28853) (2026-08-06) [Austin (Thang Pham)]<br>```

Update grpcurl to use the first grpc-go release that fixes GHSA-hrxh-6v49-42gf.

Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
Copilot-Session: e838b61b-d284-4649-9a41-38824c1a742a
#### Why I did it

The build was failing while fetching the `p4lang-p4c` source package:
`get_url_version http://download.opensuse.org/repositories/home:/p4lang/Debian_11/p4lang-p4c_1.2.4.2-2.dsc failed`
The OpenSUSE OBS repository (`home:/p4lang/Debian_11`) only keeps the latest revision of each package. Once `p4lang-p4c` was republished, the `1.2.4.2-2` revision stopped resolving and the build broke. The currently published revision is `1.2.4.2-3`.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

Bumped the pinned `p4lang-p4c` version to the published revision `1.2.4.2-3`:
- `rules/p4lang.mk`: `P4LANG_P4C_VERSION_FULL` -> `$(P4LANG_P4C_VERSION)-3`.
- `dockers/docker-ptf/Dockerfile.j2`: `apt install` reference -> `p4lang-p4c_1.2.4.2-3_amd64.deb`.

#### How to verify it

Build the docker-ptf image / `target/sonic-vs.img.gz`; the `p4lang-p4c` deb fetch and build succeed.

#### Which release branch to backport (provide reason below if selected)

This is a build fix; it can be backported to active release branches that still pin `p4lang-p4c 1.2.4.2-2` and hit the same OpenSUSE fetch failure.

- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [ ] 202511
- [ ] 202512
- [ ] 202605
- [ ] 202608

#### Tested branch

- [x] master
- [x] 202605
- [ ] 202611

#### Test result

Validated by the PR `Azure.sonic-buildimage` CI on this commit: all build jobs (`BuildVS vs` / `vpp` / `alpinevs`, `broadcom`, `mellanox`, `marvell_prestera`, `nvidia_bluefield`, `aspeed_arm64`) and the Elastictest KVM test suites (t0, t0-2vlans, t1-lag, t1-lag-vpp, t2, multi-asic-t1, dualtor, dpu) passed.
Verified on 202511, 202605 branches.

#### Description for the changelog

Bump p4lang-p4c to 1.2.4.2-3

#### Link to config_db schema for YANG module changes

N/A. No YANG or config_db schema changes.

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).

mssonicbld and others added 2 commits August 6, 2026 23:12
…utomatically (#28869)

#### Why I did it
src/sonic-host-services
```
* c3bf111 - (HEAD -> 202605, origin/202605) [gnoi-shutdown]: Use Wants= for gnmi.service so ExecCondition runs when gnmi is masked (Azure#420) (49 minutes ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@mssonicbld
mssonicbld force-pushed the sonicbld/202607-merge branch from d0dceec to 638c2f2 Compare August 7, 2026 03:03
@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

@mssonicbld
mssonicbld merged commit 087bca9 into Azure:202607 Aug 7, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants