Skip to content

[FRR]: Use stg in a proper way.#3589

Merged
pavel-shirshov merged 3 commits intosonic-net:masterfrom
wangshengjun:dev
Oct 15, 2019
Merged

[FRR]: Use stg in a proper way.#3589
pavel-shirshov merged 3 commits intosonic-net:masterfrom
wangshengjun:dev

Conversation

@wangshengjun
Copy link
Copy Markdown
Contributor

Signed-off-by: wangshengjun wangshengjun@asterfusion.com

- What I did
use stg branch instead of git branch.
- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
MAIN_TARGET = $(FRR)
DERIVED_TARGET = $(FRR_PYTHONTOOLS) $(FRR_DBG) $(FRR_SNMP) $(FRR_SNMP_DBG)
BRANCH = $(shell date +%Y%m%d\.%H%M%S)
FRR_VERSION = 7.1
Copy link
Copy Markdown
Collaborator

@nikos-github nikos-github Oct 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to define it. It's exported from rules/frr.mk: export FRR_VERSION FRR_SUBVERSION along with the subversion so we can just use it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your comment! I will remove it.

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
@pavel-shirshov pavel-shirshov merged commit 34d8842 into sonic-net:master Oct 15, 2019
lguohan pushed a commit that referenced this pull request Nov 4, 2019
…3692)

Fixed Makefile of FRR. Before we had issues after #3589:

- When you want to rebuild frr with new changes you get error "branch frr/7.1 is already exist".
- When your patch list is empty stg undo gives an error
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants