matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[frr]: Use tag for building frr (#4082)

Browse Source 
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.
This commit is contained in:
pavel-shirshov 2020-02-07 07:51:01 -08:00 committed by GitHub
parent 57d4c841db
commit c63b5fc719
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rules/frr.mk
View File

@ -3,6 +3,7 @@
FRR_VERSION = 7.2.1 FRR_VERSION = 7.2.1
FRR_SUBVERSION = 0 FRR_SUBVERSION = 0
FRR_BRANCH = frr/7.2 FRR_BRANCH = frr/7.2
FRR_TAG = frr-7.2.1-s1
export FRR_VERSION FRR_SUBVERSION FRR_BRANCH export FRR_VERSION FRR_SUBVERSION FRR_BRANCH

2
src/sonic-frr/Makefile
View File

@ -11,7 +11,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Build the package # Build the package
pushd ./frr pushd ./frr
git checkout -b $(FRR_BRANCH) origin/$(FRR_BRANCH) 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 stg import -s ../patch/series
tools/tarsource.sh -V -e '-sonic' tools/tarsource.sh -V -e '-sonic'
dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib -j$(SONIC_CONFIG_MAKE_JOBS) dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib -j$(SONIC_CONFIG_MAKE_JOBS)