From ca8ad67102bff867f1a3c6a778e769a9fb4e78c9 Mon Sep 17 00:00:00 2001
From: wangshengjun <wangshengjun@asterfusion.com>
Date: Thu, 10 Oct 2019 20:07:41 +0800
Subject: [PATCH 1/3] [FRR]: Use stg in a proper way.

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
---
 src/sonic-frr/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile
index 4a31f23436ec..64a9008c1b29 100644
--- a/src/sonic-frr/Makefile
+++ b/src/sonic-frr/Makefile
@@ -4,20 +4,18 @@ SHELL = /bin/bash
 
 MAIN_TARGET = $(FRR)
 DERIVED_TARGET = $(FRR_PYTHONTOOLS) $(FRR_DBG) $(FRR_SNMP) $(FRR_SNMP_DBG)
-BRANCH = $(shell date +%Y%m%d\.%H%M%S)
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Build the package
 	pushd ./frr	
-	git checkout -b $(BRANCH) origin/frr/7.1
-	stg init
+	stg branch --create temp origin/frr/7.1
 	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)
 	stg undo
 	git clean -xfdf
 	git checkout frr/7.1
-	git branch -D $(BRANCH)
+	stg branch --delete temp
 	popd
 	mv $(DERIVED_TARGET) $* $(DEST)/
 

From 44f9e983ce85df2880a4791efc6b28cd8b2ddbc9 Mon Sep 17 00:00:00 2001
From: wangshengjun <wangshengjun@asterfusion.com>
Date: Fri, 11 Oct 2019 14:53:54 +0800
Subject: [PATCH 2/3] [FRR]restore the detach status for frr submodule after
 finish patching

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
---
 src/sonic-frr/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile
index 64a9008c1b29..6005c5a021a7 100644
--- a/src/sonic-frr/Makefile
+++ b/src/sonic-frr/Makefile
@@ -4,18 +4,24 @@ SHELL = /bin/bash
 
 MAIN_TARGET = $(FRR)
 DERIVED_TARGET = $(FRR_PYTHONTOOLS) $(FRR_DBG) $(FRR_SNMP) $(FRR_SNMP_DBG)
+FRR_VERSION = 7.1
+FRR_BRANCH = frr/$(FRR_VERSION)
+STG_BRANCH = stg_temp
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Build the package
-	pushd ./frr	
-	stg branch --create temp origin/frr/7.1
+	pushd ./frr
+	git checkout -b $(FRR_BRANCH) origin/$(FRR_BRANCH)
+	stg branch --create $(STG_BRANCH) $(FRR_BRANCH)
 	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)
 	stg undo
 	git clean -xfdf
-	git checkout frr/7.1
-	stg branch --delete temp
+	git checkout $(FRR_BRANCH)
+	stg branch --delete $(STG_BRANCH)
+	git rev-parse --short HEAD | xargs git checkout
+	git branch -D $(FRR_BRANCH)
 	popd
 	mv $(DERIVED_TARGET) $* $(DEST)/
 

From 9153d0e9731a2473ac2e706ca3a1bfe443915e3f Mon Sep 17 00:00:00 2001
From: wangshengjun <wangshengjun@asterfusion.com>
Date: Sat, 12 Oct 2019 09:58:32 +0800
Subject: [PATCH 3/3] [FRR]use the 'FRR_VERSION' exported from 'rule/frr.mk'.

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
---
 src/sonic-frr/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile
index 6005c5a021a7..233696de804a 100644
--- a/src/sonic-frr/Makefile
+++ b/src/sonic-frr/Makefile
@@ -4,7 +4,6 @@ SHELL = /bin/bash
 
 MAIN_TARGET = $(FRR)
 DERIVED_TARGET = $(FRR_PYTHONTOOLS) $(FRR_DBG) $(FRR_SNMP) $(FRR_SNMP_DBG)
-FRR_VERSION = 7.1
 FRR_BRANCH = frr/$(FRR_VERSION)
 STG_BRANCH = stg_temp