Update frr to latest 7.2.1 (#4145)

sonic-net · Apr 19, 2020 · c7c78f0 · c7c78f0
1 parent 9b017a8
commit c7c78f0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 76 deletions.
diff --git a/rules/frr.mk b/rules/frr.mk
@@ -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-s2
 export FRR_VERSION FRR_SUBVERSION FRR_BRANCH
 
 

diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr
diff --git a/src/sonic-frr/patch/0005-nexthops-compare-vrf-only-if-ip-type.patch b/src/sonic-frr/patch/0005-nexthops-compare-vrf-only-if-ip-type.patch
diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series
@@ -2,5 +2,4 @@
 0002-Reduce-severity-of-Vty-connected-from-message.patch
 0003-Use-vrf_id-for-vrf-not-tabled_id.patch
 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