From 1b4e4323628ecdedb162e429aa4600131d925803 Mon Sep 17 00:00:00 2001 From: shilongliu Date: Mon, 25 Mar 2024 17:43:29 +0800 Subject: [PATCH 1/2] [build] Add passwd into RFS .flags file to avoid vs build failure. --- Makefile.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.cache b/Makefile.cache index 909f329107..1c78f40477 100644 --- a/Makefile.cache +++ b/Makefile.cache @@ -406,7 +406,7 @@ $(foreach pkg, $(SONIC_INSTALL_PKGS), \ $(foreach pkg, $(SONIC_RFS_TARGETS), \ $(eval $(pkg)_DST_PATH := $(if $($(pkg)_DST_PATH), $($(pkg)_DST_PATH), $(TARGET_PATH))) \ $(eval $(pkg)_CACHE_MODE := GIT_CONTENT_SHA) \ - $(eval $(pkg)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)) \ + $(eval $(pkg)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(PASSWORD)) \ $(eval $(pkg)_DEP_FILES := $(SONIC_COMMON_BASE_FILES_LIST) $(RFS_DEP_FILES)) \ $(eval $(TARGET_PATH)/$(pkg)_TARGET := $(pkg)) ) From b655e2a7056b16ef5e89768a87f85ebacb57081f Mon Sep 17 00:00:00 2001 From: shilongliu Date: Mon, 25 Mar 2024 17:47:40 +0800 Subject: [PATCH 2/2] fix --- Makefile.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.cache b/Makefile.cache index 1c78f40477..b0754c9499 100644 --- a/Makefile.cache +++ b/Makefile.cache @@ -406,7 +406,7 @@ $(foreach pkg, $(SONIC_INSTALL_PKGS), \ $(foreach pkg, $(SONIC_RFS_TARGETS), \ $(eval $(pkg)_DST_PATH := $(if $($(pkg)_DST_PATH), $($(pkg)_DST_PATH), $(TARGET_PATH))) \ $(eval $(pkg)_CACHE_MODE := GIT_CONTENT_SHA) \ - $(eval $(pkg)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(PASSWORD)) \ + $(eval $(pkg)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(USERNAME) $(PASSWORD)) \ $(eval $(pkg)_DEP_FILES := $(SONIC_COMMON_BASE_FILES_LIST) $(RFS_DEP_FILES)) \ $(eval $(TARGET_PATH)/$(pkg)_TARGET := $(pkg)) )