[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405#1876
Open
mssonicbld wants to merge 8 commits intoAzure:202405from
Open
[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405#1876mssonicbld wants to merge 8 commits intoAzure:202405from
mssonicbld wants to merge 8 commits intoAzure:202405from
Conversation
Collaborator
mssonicbld
commented
Dec 6, 2025
mssonicbld
commented
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it The build fails if kdump is enabled on the build host, even though the relevant build step is performed in a dockerized chroot. ``` + sudo LANG=C chroot ./fsroot-cisco-8000 kdump-config symlinks 5.10.0-23-2-amd64 Cannot change symbolic links when kdump is loaded ... failed! ``` Fixes #5097, Fixes #17023 ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it kdump installation checks if kdump is already running and aborts if so. This is good in most cases, but it's not relevant when installing into a chroot inside a docker container. This adds a basic patch to disable this check during build. Note that the kdump status of the build host is imported into the docker build container via the sysfs file system: ``` $ ls -id /sys/kernel/kexec_crash_loaded && cat /sys/kernel/kexec_crash_loaded 7824 /sys/kernel/kexec_crash_loaded 0 $ docker run --rm debian bash -c "ls -id /sys/kernel/kexec_crash_loaded && cat /sys/kernel/kexec_crash_loaded" 7824 /sys/kernel/kexec_crash_loaded 0 ``` The inodes and file content are identical inside and outside of the container. #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> 1. Enable kdump on the build host 2. Confirm baseline build fails with the "Cannot change symbolic links when kdump is loaded" error 3. Apply this change and build succeeds #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [x] 202405 - [x] 202411 - [x] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> master (2975205) #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> [build] fix build failure on kdump-enabled hosts <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it The `sonic-utilities-data_1.0-1_all.deb` target depends on sources from the `src/sonic-utilities` submodule. However, the cache dependency file does not list this submodule as a dependency. So, when the build cache is used, updates to the `src/sonic-utilities` submodule pointer do not trigger the necessary rebuild of `sonic-utilities-data_1.0-1_all.deb`, leading to a stale build output. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Updated `rules/sonic-utilities-data.dep` to include the proper `SMDEP` rules. #### How to verify it 1. Perform a build with the dpkg cache enabled 2. Confirm the new output file `target/debs/bookworm/sonic-utilities-data_1.0-1_all.deb.smdep` is created, containing the submodule dependencies (smdeps) 3. Archive the `target/debs/bookworm/sonic-utilities-data_1.0-1_all.deb` output outside the build workspace 4. Clean the build workspace 5. Update the `src/sonic-utilities` submodule pointer to a new commit that contains different source code 6. Perform another build with the dpkg cache enabled 7. Extract the previous and current `sonic-utilities-data_1.0-1_all.deb` outputs. Confirm that the contents of the debian packages are distinct and contain the expected source based on the respective `src/sonic-utilities` submodule pointers <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [x] 202405 - [x] 202411 - [x] 202505 This is a build bug which silently results in incorrect build outputs when the dpkg cache is used. As such, it should be double committed. #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [x] 202405 (6fad19a) #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> Fix submodule build dependency for sonic-utilities-data <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
Why I did it Migrate agent pool and update j2 accordingly. * [ci] Migrate agent pool from sonicbld-1es to sonicso1ES-amd64 signed-off-by: jianquanye@microsoft.com
Why I did it Fix too many open file error when building image
…tically (#24571) #### Why I did it src/sonic-dash-api ``` * 3f67090 - (HEAD -> 202405, origin/202405) Automated agent pool migration for branch 202405 (Azure#49) (35 minutes ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog
…omatically (#24670) #### Why I did it src/sonic-swss-common ``` * 36f40a1 - (HEAD -> 202405, origin/202405) Automated agent pool migration for branch 202405 (Azure#1107) (21 hours ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog
Collaborator
Author
|
/azp run |
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
d4fbe66 to
90ee492
Compare
Collaborator
Author
|
/azp run |
|
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. |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202405-merge
branch
from
90ee492 to
2b615d7
Compare
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
2b615d7 to
95536d4
Compare
Collaborator
Author
|
/azp run |
|
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. |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202405-merge
branch
from
95536d4 to
e9d4ea9
Compare
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
e9d4ea9 to
b460b62
Compare
Collaborator
Author
|
/azp run |
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
b460b62 to
071310d
Compare
Collaborator
Author
|
/azp run |
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
071310d to
9d98b88
Compare
Collaborator
Author
|
/azp run |
|
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. |
Collaborator
Author
|
/azp run |
|
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. |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202405-merge
branch
from
a07ad37 to
0269be5
Compare
|
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. |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202405-merge
branch
from
0269be5 to
35e09a1
Compare
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
35e09a1 to
ac88fb7
Compare
Collaborator
Author
|
/azp run |
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
ac88fb7 to
c2dea66
Compare
Collaborator
Author
|
/azp run |
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
c2dea66 to
8abb10f
Compare
Collaborator
Author
|
/azp run |
|
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. |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202405-merge
branch
from
8abb10f to
826938d
Compare
|
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. |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202405-merge
branch
from
826938d to
aab79e5
Compare
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
aab79e5 to
2a8372c
Compare
Collaborator
Author
|
/azp run |
|
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
force-pushed
the
sonicbld/202405-merge
branch
from
2a8372c to
5f0aa2e
Compare
Collaborator
Author
|
/azp run |
|
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. |
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.