[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#149
Merged
mssonicbld merged 4 commits intoAzure:202205from Oct 28, 2023
Merged
Conversation
Collaborator
mssonicbld
commented
Oct 28, 2023
mssonicbld
commented
* [baseimage]: Update openssh to 1:8.4p1-5+deb11u2 (#16826) Openssh in Debian Bullseye has been updated to 1:8.4p1-5+deb11u2 to fix CVE-2023-38408. Since we're building openssh with some patches, we need to update our version as well. Signed-off-by: Saikrishna Arcot <[email protected]> * Remove main deb installation for derived deb build (#16859) * Don't install dependencies of derived debs When "building" a derived deb package, don't install the dependencies of the package into the container. It's not needed at this stage. * Re-add openssh-client and openssh-sftp-server as derived debs Signed-off-by: Saikrishna Arcot <[email protected]> --------- Signed-off-by: Saikrishna Arcot <[email protected]> * Re-add missing dependency for derived debs. (#16896) * Re-add missing dependency for derived debs. My previous changed removed the whole dependency on the main deb existing, not just the installation of the main deb. Fix this by readding a dependency on the main deb being built/pulled from cache. Signed-off-by: Saikrishna Arcot <[email protected]> * Add the kernel and initramfs as dependencies for RFS build Signed-off-by: Saikrishna Arcot <[email protected]> --------- Signed-off-by: Saikrishna Arcot <[email protected]> --------- Signed-off-by: Saikrishna Arcot <[email protected]>
… (#16937) (#17028) Why I did it To avoid orchagent crash issue like sonic-net/sonic-swss#2935, disable unsupported counters on SONiC management devices. Work item tracking Microsoft ADO (number only): 25437720 How I did it Update the minigraph parser to disable unsupported counters on management devices. How to verify it Verified by unittest. Manually apply patch to DUT and do config load_minigraph Co-authored-by: Zhijian Li <[email protected]>
Why I did it When using sonic-slave-buster to convert sonic-vs.img.gz to vhdx, it also needs reproducible options. Otherwise it will rebuild sonic-slave-buster because tag different. Work item tracking Microsoft ADO (number only): 25615544 How I did it Add build options to use same sonic-slave docker when generating vhdx image. How to verify it
mssonicbld
requested review from
a team,
lguohan,
qiluo-msft and
xumia
as code owners
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
May 3, 2024
…lly (#16480) #### Why I did it src/sonic-gnmi ``` * 6fd461c - (HEAD -> master, origin/master, origin/HEAD) Get origin from prefix (Azure#149) (17 hours ago) [ganglv] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Nov 25, 2025
…tomatically (#1845) #### Why I did it src/sonic-swss ``` * 21d0672b - (HEAD -> 202503, origin/202503) [code sync] Merge code from sonic-net/sonic-swss:202412 to 202503 (#149) (6 hours ago) [mssonicbld] * 30b0ffdc - Merge branch '202412' of https://github.com/Azure/sonic-swss.msft into 202503 (3 months ago) [Sonic Automation] * 17a12cb9 - Support HFT on PG, QUEUE and BUFFER_POOL (#148) (3 months ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.