Skip to content

Commit

Permalink
[Build]: Fix dep files for sairedis, syncd and libsaithrift-dev (soni…
Browse files Browse the repository at this point in the history 
…c-net#19172)

Fix DPKG cache errors when configure or build SONiC:

/bin/bash: line 1: cd: src/sonic-sairedis/SAI/bm/behavioral-model: No such file or directory
/bin/bash: line 1: cd: src/sonic-sairedis/SAI/bm/behavioral-model: No such file or directory
Submodule bm/behavioral-model has been removed from SAI repo in opencomputeproject/SAI#1954

But dep files in sonic-buildimage haven't been updated.
  • Loading branch information
@k-v1 @arun1355492
k-v1 authored and arun1355492 committed Jul 26, 2024
1 parent 3d57b64 commit 3eb2277
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion platform/broadcom/libsaithrift-dev.dep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SPATH := $($(LIBSAITHRIFT_DEV)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/broadcom/libsaithrift-dev.mk platform/broadcom/libsaithrift-dev.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
SMDEP_PATHS := $(SPATH) $(SPATH)/bm/behavioral-model $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen
SMDEP_PATHS := $(SPATH) $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen
$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, $(shell cd $(path) && git ls-files | grep -Ev " " )))))

$(LIBSAITHRIFT_DEV)_CACHE_MODE := GIT_CONTENT_SHA
Expand Down
2 changes: 1 addition & 1 deletion platform/innovium/libsaithrift-dev.dep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SPATH := $($(LIBSAITHRIFT_DEV)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/innovium/libsaithrift-dev.mk platform/innovium/libsaithrift-dev.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
SMDEP_PATHS := $(SPATH) $(SPATH)/bm/behavioral-model $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen
SMDEP_PATHS := $(SPATH) $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen
$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, $(shell cd $(path) && git ls-files | grep -Ev " " )))))

$(LIBSAITHRIFT_DEV)_CACHE_MODE := GIT_CONTENT_SHA
Expand Down
2 changes: 1 addition & 1 deletion platform/marvell/libsaithrift-dev.dep
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SPATH := $($(LIBSAITHRIFT_DEV)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/libsaithrift-dev.mk $(PLATFORM_PATH)/libsaithrift-dev.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
SMDEP_PATHS := $(SPATH) $(SPATH)/bm/behavioral-model $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen
SMDEP_PATHS := $(SPATH) $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen
$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, $(shell cd $(path) && git ls-files | grep -Ev " " )))))

$(LIBSAITHRIFT_DEV)_CACHE_MODE := GIT_CONTENT_SHA
Expand Down
2 changes: 1 addition & 1 deletion platform/vs/libsaithrift-dev.dep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SPATH := $($(LIBSAITHRIFT_DEV)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/broadcom/libsaithrift-dev.mk platform/broadcom/libsaithrift-dev.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
SMDEP_PATHS := $(SPATH) $(SPATH)/bm/behavioral-model $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen
SMDEP_PATHS := $(SPATH) $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen
$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, $(shell cd $(path) && git ls-files | grep -Ev " " )))))

$(LIBSAITHRIFT_DEV)_CACHE_MODE := GIT_CONTENT_SHA
Expand Down
2 changes: 1 addition & 1 deletion rules/sairedis.dep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPATH := $($(LIBSAIREDIS)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sairedis.mk rules/sairedis.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)

SMDEP_PATHS := $(SPATH) $(SPATH)/SAI $(SPATH)/SAI/bm/behavioral-model $(SPATH)/SAI/test/ptf $(SPATH)/SAI/test/saithrift/ctypesgen
SMDEP_PATHS := $(SPATH) $(SPATH)/SAI $(SPATH)/SAI/test/ptf $(SPATH)/SAI/test/saithrift/ctypesgen
$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, \
$(shell cd $(path) && git ls-files | grep -v " ")))))

Expand Down
2 changes: 1 addition & 1 deletion rules/syncd.dep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPATH := $($(SYNCD)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/syncd.mk rules/syncd.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)

SMDEP_PATHS := $(SPATH) $(SPATH)/SAI $(SPATH)/SAI/bm/behavioral-model $(SPATH)/SAI/test/ptf $(SPATH)/SAI/test/saithrift/ctypesgen
SMDEP_PATHS := $(SPATH) $(SPATH)/SAI $(SPATH)/SAI/test/ptf $(SPATH)/SAI/test/saithrift/ctypesgen
$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, \
$(shell cd $(path) && git ls-files | grep -v " ")))))

Expand Down

0 comments on commit 3eb2277

Please sign in to comment.