[build/frr] Properly reset sonic-frr/frr branch after build #20868
+17
−16
Conversation
This file contains 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
wdoekes
force-pushed
the
reset-sonic-frr-submodule-after-build
branch
2 times, most recently
from
820504f
to
91166ac
Compare
==== Why I did it After a build ./src/sonic-frr/frr was always marked as "modified". This changeset resets it to the way it was before the build. Resolves: sonic-net#20869 ==== How I did it The sonic-frr/Makefile had steps to apply stg (and other) patches. Now a checkout to the original branch is done at the end, and other cleanup is done at the start. ==== How to verify it Run: make configure PLATFORM=broadcom make BLDENV=bookworm -f Makefile.work \ target/debs/bookworm/frr_8.5.4-sonic-0_amd64.deb Observe how ./src/sonic-frr/frr is unchanged afterwards. The patched version is still available in a stored stg_temp branch.
wdoekes
force-pushed
the
reset-sonic-frr-submodule-after-build
branch
from
91166ac
to
a0bce7a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Why I did it
After a build ./src/sonic-frr/frr was always marked as "modified". This changeset resets it to the way it was before the build.
Resolves: #20869
How I did it
The sonic-frr/Makefile had steps to apply stg (and other) patches. Now a checkout to the original branch is done at the end, and other cleanup is done at the start.
How to verify it
Run:
Observe how ./src/sonic-frr/frr is unchanged afterwards. The patched version is still available in a stored stg_temp branch.
Which release branch to backport (provide reason below if selected)
^- also relevant for 202405 branch (needs slight change)
Tested branch (Please provide the tested image version)
master