From a980e836c1ec9550b74470671052943d42a9f1ed Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 11 Nov 2021 19:39:25 -0800 Subject: [PATCH] [mellanox]: Disable caching for the issu-version file (#9235) The issu-version file for Mellanox is generated from the Mellanox SDK libraries. The SDK is installed into a Buster docker container, but the issu-version file goes onto the base OS, which is Bullseye. To work around this, the issu-version build rules explicitly copies the issu-version file to target/files/bullseye/ during the Buster build. Because of our build infra, if caching is enabled and a cache is being used, then for issu-version, since it is technically built as part of Buster, then only target/files/buster/issu-version is saved into the cache, and target/files/bullseye/issu-version isn't cached. If this cache gets used, then target/files/bullseye/issu-version is missing, and the final image build fails. This is to work around the current build issue where Mellanox builds are failing. This is so that issu-version is always "built", so that copy is made into the bullseye directory. Signed-off-by: Saikrishna Arcot --- platform/mellanox/issu-version.dep | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/mellanox/issu-version.dep b/platform/mellanox/issu-version.dep index c4a178aef7..bb8e251325 100644 --- a/platform/mellanox/issu-version.dep +++ b/platform/mellanox/issu-version.dep @@ -5,6 +5,7 @@ DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/issu-version.mk $(PLATF DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) DEP_FILES += $(shell git ls-files -- $(SPATH)) -$(ISSU_VERSION_FILE)_CACHE_MODE := GIT_CONTENT_SHA +#$(ISSU_VERSION_FILE)_CACHE_MODE := GIT_CONTENT_SHA +$(ISSU_VERSION_FILE)_CACHE_MODE := none $(ISSU_VERSION_FILE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(ISSU_VERSION_FILE)_DEP_FILES := $(DEP_FILES)