From ab97491a37d80aee37253df777d0dc7fb0f1a34b Mon Sep 17 00:00:00 2001 From: Yakiv Huryk Date: Mon, 23 May 2022 11:57:32 +0000 Subject: [PATCH] [asan] add debug package for asan-enabled containers Signed-off-by: Yakiv Huryk --- platform/mellanox/docker-syncd-mlnx.mk | 4 ++++ rules/docker-orchagent.mk | 4 ++++ rules/syncd.mk | 2 -- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk index 1328d0e0d0dd..37ffe1203f7d 100644 --- a/platform/mellanox/docker-syncd-mlnx.mk +++ b/platform/mellanox/docker-syncd-mlnx.mk @@ -21,6 +21,10 @@ include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MFT) +ifeq ($(ENABLE_ASAN), y) +$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD_DBG) +endif + $(DOCKER_SYNCD_BASE)_FILES += $(ISSU_VERSION_FILE) $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \ diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk index 917fe0b13661..fed461290f4b 100644 --- a/rules/docker-orchagent.mk +++ b/rules/docker-orchagent.mk @@ -6,6 +6,10 @@ DOCKER_ORCHAGENT_DBG = $(DOCKER_ORCHAGENT_STEM)-$(DBG_IMAGE_MARK).gz $(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS) +ifeq ($(ENABLE_ASAN), y) +$(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS_DBG) +endif + $(DOCKER_ORCHAGENT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_DEPENDS) $(DOCKER_ORCHAGENT)_DBG_DEPENDS += $(SWSS_DBG) \ $(LIBSWSSCOMMON_DBG) \ diff --git a/rules/syncd.mk b/rules/syncd.mk index 595e04671c30..2b7007d84d5b 100644 --- a/rules/syncd.mk +++ b/rules/syncd.mk @@ -21,12 +21,10 @@ $(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV) $(SYNCD)_DPKG_TARGET = binary-syncd-rpc endif -ifeq ($(INSTALL_DEBUG_TOOLS), y) SYNCD_DBG = syncd-dbg_1.0.0_$(CONFIGURED_ARCH).deb $(SYNCD_DBG)_DEPENDS += $(SYNCD) $(SYNCD_DBG)_RDEPENDS += $(SYNCD) $(eval $(call add_derived_package,$(SYNCD),$(SYNCD_DBG))) -endif ifeq ($(ENABLE_SYNCD_RPC),y) SYNCD_RPC_DBG = syncd-rpc-dbg_1.0.0_$(CONFIGURED_ARCH).deb