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

[frr]: Fix for missing dependency in frr module (#6094)

Browse Source 
The soinc-frr module has src/sonic-frr/frr submodule. The FRR sub module dependency files are not added to the DPKG file tracking. The patch includes the following.

- Included the submodule dependency files
- Removes the symbolic files.
This commit is contained in:
Kalimuthu-Velappan 2020-12-03 16:05:21 +05:30 committed by GitHub
parent fc0e6af337
commit 7bcb18fd92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rules/frr.dep
View File

@ -2,9 +2,24 @@
SPATH := $($(FRR)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/frr.mk rules/frr.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
DEP_FILES += $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files |grep -Ev '^frr$$$$'))
# Account for source files under the frr submodule directory as well.
# Remove all the symbolic link files
FRR_SPATH := $(SPATH)/frr
SMDEP_FILES := $(addprefix $(FRR_SPATH)/,$(shell cd $(FRR_SPATH) && git ls-files \
| grep -Ev -e 'debian/changelog$$$$' \
-e '^tests/topotests/bgp_instance_del_test/ce[0-9]$$$$' \
-e '^tests/topotests/bgp_instance_del_test/r[0-9]$$$$' \
-e '^tests/topotests/bgp_instance_del_test/scripts$$$$' \
-e '^tests/topotests/bgp_instance_del_test/customize.py$$$$' \
-e '^tests/topotests/bgp_rfapi_basic_sanity_config2/customize.py$$$$' \
-e '^tests/topotests/bgp_rfapi_basic_sanity_config2/scripts$$$$' \
-e '^tests/topotests/bgp_rfapi_basic_sanity_config2/test_bgp_rfapi_basic_sanity_config2.py$$$$' \
))
$(FRR)_CACHE_MODE := GIT_CONTENT_SHA
$(FRR)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(FRR)_DEP_FILES := $(DEP_FILES)
$(FRR)_SMDEP_FILES := $(SMDEP_FILES)
$(FRR)_SMDEP_PATHS := $(FRR_SPATH)