Skip to content
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.

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

[build/frr] Properly reset sonic-frr/frr branch after build #20868

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Commits on Nov 20, 2024

  1. [build/frr] Properly reset sonic-frr/frr branch after build

    ==== 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 committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    a0bce7a View commit details
    Browse the repository at this point in the history