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.

Sign up for GitHub

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

Jump to bottom

[FRR]: Update frr to latest 7.2.1-s3 #4294

Merged
merged 4 commits into from
Apr 1, 2020
Merged

[FRR]: Update frr to latest 7.2.1-s3 #4294

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e23bb25
[FRR]: Update frr to latest 7.2.1
pavel-shirshov Mar 19, 2020
e0d0e90
Remove one more patch
pavel-shirshov Mar 23, 2020
c88abda
Revert "Remove one more patch"
pavel-shirshov Mar 24, 2020
738692e
Restore patches
pavel-shirshov Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rules/frr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
FRR_VERSION = 7.2.1
FRR_SUBVERSION = 0
FRR_BRANCH = frr/7.2
FRR_TAG = frr-7.2.1-s1
FRR_TAG = frr-7.2.1-s3
export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG


Expand Down
2 changes: 1 addition & 1 deletion src/sonic-frr/frr
Open in desktop
Submodule frr updated from 90446e to 2f3f69
35 changes: 0 additions & 35 deletions src/sonic-frr/patch/0003-Use-vrf_id-for-vrf-not-tabled_id.patch
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions src/sonic-frr/patch/0005-nexthops-compare-vrf-only-if-ip-type.patch
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/sonic-frr/patch/series
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
0001-Add-support-of-bgp-tcp-DSCP-value.patch
0002-Reduce-severity-of-Vty-connected-from-message.patch
0003-Use-vrf_id-for-vrf-not-tabled_id.patch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This patch is required. Otherwise fpmsyncd will break at https://github.com/Azure/sonic-swss/blob/master/fpmsyncd/routesync.cpp#L46

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@prsunny Yes. I understand. I need to remove it, to build an image and run the tests.

0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
0005-nexthops-compare-vrf-only-if-ip-type.patch
0006-changes-for-making-snmp-socket-non-blocking.patch