From c6647eca4b7614a3d605d5def8839ace54c167c5 Mon Sep 17 00:00:00 2001 From: pavel-shirshov Date: Fri, 7 Feb 2020 07:51:01 -0800 Subject: [PATCH] [frr]: Use tag for building frr (#4082) Changed logic for building frr. Previously we used latest commit in the FRR_BRANCH. Now the buildsystem will use a tag to identify a commit for building. New approach will let us to update sonic-frr without corrupting building sonic-buildimage. --- rules/frr.mk | 1 + src/sonic-frr/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/frr.mk b/rules/frr.mk index b2e347e0b12d..e5c9c230a766 100644 --- a/rules/frr.mk +++ b/rules/frr.mk @@ -3,6 +3,7 @@ FRR_VERSION = 7.2.1 FRR_SUBVERSION = 0 FRR_BRANCH = frr/7.2 +FRR_TAG = frr-7.2.1-s1 export FRR_VERSION FRR_SUBVERSION FRR_BRANCH diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index 8910798c5827..296f0226d2fe 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -11,7 +11,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Build the package pushd ./frr git checkout -b $(FRR_BRANCH) origin/$(FRR_BRANCH) - stg branch --create $(STG_BRANCH) $(FRR_BRANCH) + stg branch --create $(STG_BRANCH) $(FRR_TAG) stg import -s ../patch/series tools/tarsource.sh -V -e '-sonic' dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib -j$(SONIC_CONFIG_MAKE_JOBS)