From 51b50087fa7066508c7afe80a355de16285f02db Mon Sep 17 00:00:00 2001 From: Masaru OKI Date: Wed, 12 Jul 2023 06:32:08 +0900 Subject: [PATCH] Pick dependency files in submodules. (#15142) #### Why I did it Failed to build sonic-dhcp6relay_1.0.0-0_amd64.deb #### How I did it src/dhcprelay has git submodule. Dependency files by "git ls-files" are not picked files in submodules. Add --recurse-submodules, work again. #### How to verify it make all --- rules/dhcprelay.dep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/dhcprelay.dep b/rules/dhcprelay.dep index 5f6d77a84f..552fda2480 100644 --- a/rules/dhcprelay.dep +++ b/rules/dhcprelay.dep @@ -2,7 +2,7 @@ SPATH := $($(SONIC_DHCPRELAY)_SRC_PATH) DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/dhcprelay.mk rules/dhcprelay.dep DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files)) +SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files --recurse-submodules)) $(SONIC_DHCPRELAY)_CACHE_MODE := GIT_CONTENT_SHA $(SONIC_DHCPRELAY)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)