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

[FRR]: Change the FRR as a submodule (#1071)

Browse Source 
Signed-off-by: zxu@linkedin.com
This commit is contained in:
zhenggen-xu 2017-10-23 21:17:58 -07:00 committed by lguohan
parent fd34d907ff
commit a49ac2d211
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -66,3 +66,6 @@
[submodule "platform/broadcom/sonic-platform-modules-cel"] [submodule "platform/broadcom/sonic-platform-modules-cel"]
path = platform/broadcom/sonic-platform-modules-cel path = platform/broadcom/sonic-platform-modules-cel
url = https://github.com/celestica-Inc/sonic-platform-modules-cel.git url = https://github.com/celestica-Inc/sonic-platform-modules-cel.git
[submodule "src/sonic-frr/frr"]
path = src/sonic-frr/frr
url = https://github.com/FRRouting/frr.git

5
src/sonic-frr/Makefile
View File

@ -5,11 +5,6 @@ SHELL = /bin/bash
MAIN_TARGET = frr_$(FRR_VERSION)_amd64.deb MAIN_TARGET = frr_$(FRR_VERSION)_amd64.deb
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Cloning FRR repo if not already done
if [ ! -d "frr" ]; then \
git clone -b stable/$(FRR_VERSION) https://github.com/FRRouting/frr.git; \
fi
# Replacing frr's rules/install files with SONiC's own versions to activate # Replacing frr's rules/install files with SONiC's own versions to activate
# specific knobs and adjust install process to address SONiC's needs. # specific knobs and adjust install process to address SONiC's needs.
cp sonic_frr.rules frr/debian/rules cp sonic_frr.rules frr/debian/rules

1
src/sonic-frr/frr Submodule

@ -0,0 +1 @@
Subproject commit 5424c62d6e9d574a00529edfc0a0b3bb3beb8811