[frr]: Use tag for building frr (sonic-net#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.
SONIC-DEV · Apr 24, 2020 · 058ce68 · 058ce68
1 parent 3662865
commit 058ce68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)