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] src/sonic-frr/frr is changed after the build #20869

Open
wdoekes opened this issue Nov 20, 2024 · 0 comments · May be fixed by #20868
Open

[build/frr] src/sonic-frr/frr is changed after the build #20869

wdoekes opened this issue Nov 20, 2024 · 0 comments · May be fixed by #20868

Comments

@wdoekes
Copy link
Contributor

wdoekes commented Nov 20, 2024

Description

After the build src/sonic-frr/frr looks changed. This is cosmetic only, because a rebuild resets the submodule. But it's a small annoyance that we can fix.

Steps to reproduce the issue:

  1. make all

Describe the results you received:

  1. A built image.
  2. And some untracked files.
  3. But also a supposed change:
$ git diff
diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr
index de0e358b8..61995a7d8 160000
--- a/src/sonic-frr/frr
+++ b/src/sonic-frr/frr
@@ -1 +1 @@
-Subproject commit de0e358b877ac9b595e7fb387a302c960a4c02d1
+Subproject commit 61995a7d83f385114bd0b929f7401ae0e930dd15

Describe the results you expected:

  1. A built image.
  2. And some untracked files.
  3. But no changed files.
$ git diff
(void)

Fix

See this PR: #20868.

@wdoekes wdoekes linked a pull request Nov 20, 2024 that will close this issue
10 tasks
wdoekes added a commit to ossobv/sonic-buildimage that referenced this issue Nov 20, 2024
==== 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.

Issue: 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 added a commit to ossobv/sonic-buildimage that referenced this issue Nov 20, 2024
==== 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant