From f5ca0c7a94d70d717a8a6f1ee7a801e9a5dfb833 Mon Sep 17 00:00:00 2001 From: pavel-shirshov Date: Sat, 25 Jan 2020 19:43:22 -0800 Subject: [PATCH] [frr]: Update FRR to 7.2.1 (#4066) Update rules for frr package. Update frr submodule --- rules/frr.mk | 5 +++-- src/sonic-frr/Makefile | 1 - src/sonic-frr/frr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/frr.mk b/rules/frr.mk index 27391ce0cf..b2e347e0b1 100644 --- a/rules/frr.mk +++ b/rules/frr.mk @@ -1,8 +1,9 @@ # FRRouting (frr) package -FRR_VERSION = 7.2 +FRR_VERSION = 7.2.1 FRR_SUBVERSION = 0 -export FRR_VERSION FRR_SUBVERSION +FRR_BRANCH = frr/7.2 +export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR = frr_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index abd9adc3fc..8910798c58 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -5,7 +5,6 @@ SHELL = /bin/bash MAIN_TARGET = $(FRR) DERIVED_TARGET = $(FRR_PYTHONTOOLS) $(FRR_DBG) $(FRR_SNMP) $(FRR_SNMP_DBG) SUFFIX = $(shell date +%Y%m%d\.%H%M%S) -FRR_BRANCH = frr/$(FRR_VERSION) STG_BRANCH = stg_temp.$(SUFFIX) $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr index d49e8f75bd..90446e3c33 160000 --- a/src/sonic-frr/frr +++ b/src/sonic-frr/frr @@ -1 +1 @@ -Subproject commit d49e8f75bd46879c799375f304506dbc5d26230f +Subproject commit 90446e3c3310001a7b84017fa4b237ea7914f45e