From ad21d1ca74730d89a251d5cc4393473a2a1bab16 Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Tue, 30 Nov 2021 16:54:40 +0800 Subject: [PATCH] Support dpkg cache for marvell-armhf (#9381) Why I did it Support marvell-armhf dpkg cache --- platform/marvell-armhf/docker-saiserver-mrvl.dep | 8 ++++++++ platform/marvell-armhf/docker-syncd-mrvl-rpc.dep | 8 ++++++++ platform/marvell-armhf/docker-syncd-mrvl.dep | 10 ++++++++++ platform/marvell-armhf/libsaithrift-dev.dep | 11 +++++++++++ platform/marvell-armhf/one-image.dep | 1 + platform/marvell-armhf/platform-et6448m.dep | 8 ++++++++ platform/marvell-armhf/platform-nokia.dep | 8 ++++++++ platform/marvell-armhf/prestera.dep | 8 ++++++++ platform/marvell-armhf/rules.dep | 9 +++++++++ platform/marvell-armhf/sai.dep | 9 +++++++++ 10 files changed, 80 insertions(+) create mode 100644 platform/marvell-armhf/docker-saiserver-mrvl.dep create mode 100644 platform/marvell-armhf/docker-syncd-mrvl-rpc.dep create mode 100644 platform/marvell-armhf/docker-syncd-mrvl.dep create mode 100644 platform/marvell-armhf/libsaithrift-dev.dep create mode 100644 platform/marvell-armhf/one-image.dep create mode 100644 platform/marvell-armhf/platform-et6448m.dep create mode 100644 platform/marvell-armhf/platform-nokia.dep create mode 100644 platform/marvell-armhf/prestera.dep create mode 100644 platform/marvell-armhf/rules.dep create mode 100644 platform/marvell-armhf/sai.dep diff --git a/platform/marvell-armhf/docker-saiserver-mrvl.dep b/platform/marvell-armhf/docker-saiserver-mrvl.dep new file mode 100644 index 0000000000..73851b9bf3 --- /dev/null +++ b/platform/marvell-armhf/docker-saiserver-mrvl.dep @@ -0,0 +1,8 @@ +DPATH := $($(DOCKER_SAISERVER_MRVL)_PATH) +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/docker-saiserver-mrvl.mk platform/marvell-armhf/docker-saiserver-mrvl.dep +DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +DEP_FILES += $(shell git ls-files $(DPATH)) + +$(DOCKER_SAISERVER_MRVL)_CACHE_MODE := GIT_CONTENT_SHA +$(DOCKER_SAISERVER_MRVL)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) +$(DOCKER_SAISERVER_MRVL)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc.dep b/platform/marvell-armhf/docker-syncd-mrvl-rpc.dep new file mode 100644 index 0000000000..957d3f9e7a --- /dev/null +++ b/platform/marvell-armhf/docker-syncd-mrvl-rpc.dep @@ -0,0 +1,8 @@ +DPATH := $($(DOCKER_SYNCD_MRVL_RPC)_PATH) +DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.dep +DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +DEP_FILES += $(shell git ls-files $(DPATH)) + +$(DOCKER_SYNCD_MRVL_RPC)_CACHE_MODE := GIT_CONTENT_SHA +$(DOCKER_SYNCD_MRVL_RPC)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) +$(DOCKER_SYNCD_MRVL_RPC)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/docker-syncd-mrvl.dep b/platform/marvell-armhf/docker-syncd-mrvl.dep new file mode 100644 index 0000000000..2aaef3b506 --- /dev/null +++ b/platform/marvell-armhf/docker-syncd-mrvl.dep @@ -0,0 +1,10 @@ +DPATH := $($(DOCKER_SYNCD_BASE)_PATH) +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/docker-syncd-mrvl.mk platform/marvell-armhf/docker-syncd-mrvl.dep platform/marvell-armhf/sai.mk +DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +DEP_FILES += $(shell git ls-files $(DPATH)) + +$(DOCKER_SYNCD_BASE)_CACHE_MODE := GIT_CONTENT_SHA +$(DOCKER_SYNCD_BASE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) +$(DOCKER_SYNCD_BASE)_DEP_FILES := $(DEP_FILES) + +$(eval $(call add_dbg_docker,$(DOCKER_SYNCD_BASE),$(DOCKER_SYNCD_BASE_DBG))) diff --git a/platform/marvell-armhf/libsaithrift-dev.dep b/platform/marvell-armhf/libsaithrift-dev.dep new file mode 100644 index 0000000000..be9da37e8d --- /dev/null +++ b/platform/marvell-armhf/libsaithrift-dev.dep @@ -0,0 +1,11 @@ +SPATH := $($(LIBSAITHRIFT_DEV)_SRC_PATH) +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/libsaithrift-dev.mk platform/marvell-armhf/libsaithrift-dev.dep +DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +SMDEP_PATHS := $(SPATH) $(SPATH)/bm/behavioral-model $(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 +$(LIBSAITHRIFT_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) +$(LIBSAITHRIFT_DEV)_DEP_FILES := $(DEP_FILES) +$(LIBSAITHRIFT_DEV)_SMDEP_FILES := $(foreach path, $(SMDEP_PATHS), $($(path))) +$(LIBSAITHRIFT_DEV)_SMDEP_PATHS := $(SMDEP_PATHS) diff --git a/platform/marvell-armhf/one-image.dep b/platform/marvell-armhf/one-image.dep new file mode 100644 index 0000000000..154112a82a --- /dev/null +++ b/platform/marvell-armhf/one-image.dep @@ -0,0 +1 @@ +$(SONIC_ONE_IMAGE)_CACHE_MODE := none diff --git a/platform/marvell-armhf/platform-et6448m.dep b/platform/marvell-armhf/platform-et6448m.dep new file mode 100644 index 0000000000..5f7e41d1f7 --- /dev/null +++ b/platform/marvell-armhf/platform-et6448m.dep @@ -0,0 +1,8 @@ +MPATH := $($(ET6448M_PLATFORM)_SRC_PATH) +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/platform-et6448m.mk platform/marvell-armhf/platform-et6448m.dep +DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +DEP_FILES += $(shell git ls-files $(MPATH)) + +$(ET6448M_PLATFORM)_CACHE_MODE := GIT_CONTENT_SHA +$(ET6448M_PLATFORM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) +$(ET6448M_PLATFORM)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/platform-nokia.dep b/platform/marvell-armhf/platform-nokia.dep new file mode 100644 index 0000000000..752a2016b6 --- /dev/null +++ b/platform/marvell-armhf/platform-nokia.dep @@ -0,0 +1,8 @@ +MPATH := $($(NOKIA_7215_PLATFORM)_SRC_PATH) +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/platform-nokia.mk platform/marvell-armhf/platform-nokia.dep +DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +DEP_FILES += $(shell git ls-files $(MPATH)) + +$(NOKIA_7215_PLATFORM)_CACHE_MODE := GIT_CONTENT_SHA +$(NOKIA_7215_PLATFORM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) +$(NOKIA_7215_PLATFORM)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/prestera.dep b/platform/marvell-armhf/prestera.dep new file mode 100644 index 0000000000..4fd2883b11 --- /dev/null +++ b/platform/marvell-armhf/prestera.dep @@ -0,0 +1,8 @@ +MPATH := $($(MRVL_PRESTERA_DEB)_SRC_PATH) +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/prestera.mk platform/marvell-armhf/prestera.dep +DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +DEP_FILES += $(shell git ls-files $(MPATH)) + +$(MRVL_PRESTERA_DEB)_CACHE_MODE := GIT_CONTENT_SHA +$(MRVL_PRESTERA_DEB)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) +$(MRVL_PRESTERA_DEB)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/rules.dep b/platform/marvell-armhf/rules.dep new file mode 100644 index 0000000000..427219b355 --- /dev/null +++ b/platform/marvell-armhf/rules.dep @@ -0,0 +1,9 @@ +include $(PLATFORM_PATH)/sai.dep +include $(PLATFORM_PATH)/prestera.dep +include $(PLATFORM_PATH)/docker-syncd-mrvl.dep +include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.dep +include $(PLATFORM_PATH)/docker-saiserver-mrvl.dep +include $(PLATFORM_PATH)/libsaithrift-dev.dep +include $(PLATFORM_PATH)/platform-et6448m.dep +include $(PLATFORM_PATH)/platform-nokia.dep +include $(PLATFORM_PATH)/one-image.dep diff --git a/platform/marvell-armhf/sai.dep b/platform/marvell-armhf/sai.dep new file mode 100644 index 0000000000..d14927cdde --- /dev/null +++ b/platform/marvell-armhf/sai.dep @@ -0,0 +1,9 @@ +SPATH := $($(MRVL_SAI)_SRC_PATH) +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/sai.mk platform/marvell-armhf/sai.dep +DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +DEP_FILES += $(shell git ls-files $(SPATH)) +SMDEP_PATHS := $(SPATH) + +$(MRVL_SAI)_CACHE_MODE := GIT_CONTENT_SHA +$(MRVL_SAI)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) +$(MRVL_SAI)_DEP_FILES := $(DEP_FILES)