From e0927e28afab044b1669fe4779458734044d2a3d Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Mon, 24 Jul 2023 17:05:03 -0700 Subject: [PATCH] Update sairedis submodule (#15720) This submodule update needs to be manually done due to build changes done in the sairedis submodule. Specifically, Debian build profiles are now being used instead of dpkg build targets, and dbgsym packages are being used instead of dbg packages. Because of this, there needs to be changes on the sonic-buildimage side for this. This submodule update brings in the following changes: ce8f642 [vs] Use boost join to concatenate switch types in config (#1266) d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (#1259) e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (#1262) c08f9a2 [CI]: Fix collect log error in azp template. (#1260) eed856c [CodeQL]: Fix syncd compilation in azp template. (#1261) a3f1f1a Reland 'Make changes to building and packaging sairedis (#1116)' (#1194) Signed-off-by: Saikrishna Arcot --- platform/vs/syncd-vs.mk | 10 +++++----- rules/sairedis.mk | 25 ++++++++++++------------- rules/syncd.mk | 20 ++++++++++---------- src/sonic-sairedis | 2 +- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/platform/vs/syncd-vs.mk b/platform/vs/syncd-vs.mk index 22b34fbcaae3..6ff00a3508b9 100644 --- a/platform/vs/syncd-vs.mk +++ b/platform/vs/syncd-vs.mk @@ -1,10 +1,10 @@ -$(LIBSAIREDIS)_DPKG_TARGET = binary-syncd-vs +$(LIBSAIREDIS)_DEB_BUILD_PROFILES += syncd vs SYNCD_VS = syncd-vs_1.0.0_amd64.deb $(SYNCD_VS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBSAIVS) $(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS))) -SYNCD_VS_DBG = syncd-vs-dbg_1.0.0_amd64.deb -$(SYNCD_VS_DBG)_DEPENDS += $(SYNCD_VS) -$(SYNCD_VS_DBG)_RDEPENDS += $(SYNCD_VS) -$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS_DBG))) +SYNCD_VS_DBGSYM = syncd-vs-dbgsym_1.0.0_amd64.deb +$(SYNCD_VS_DBGSYM)_DEPENDS += $(SYNCD_VS) +$(SYNCD_VS_DBGSYM)_RDEPENDS += $(SYNCD_VS) +$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS_DBGSYM))) diff --git a/rules/sairedis.mk b/rules/sairedis.mk index 73ea1366bb92..163e9b797645 100644 --- a/rules/sairedis.mk +++ b/rules/sairedis.mk @@ -4,7 +4,6 @@ LIBSAIREDIS_VERSION = 1.0.0 LIBSAIREDIS_NAME = libsairedis LIBSAIREDIS = $(LIBSAIREDIS_NAME)_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb -$(LIBSAIREDIS)_DPKG_TARGET = binary-sairedis $(LIBSAIREDIS)_SRC_PATH = $(SRC_PATH)/sonic-sairedis $(LIBSAIREDIS)_VERSION = $(LIBSAIREDIS_VERSION) $(LIBSAIREDIS)_NAME = $(LIBSAIREDIS_NAME) @@ -30,20 +29,20 @@ LIBSAIMETADATA_DEV = libsaimetadata-dev_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH $(LIBSAIMETADATA_DEV)_DEPENDS += $(LIBSAIMETADATA) $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DEV))) -LIBSAIREDIS_DBG = $(LIBSAIREDIS_NAME)-dbg_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb -$(LIBSAIREDIS_DBG)_DEPENDS += $(LIBSAIREDIS) -$(LIBSAIREDIS_DBG)_RDEPENDS += $(LIBSAIREDIS) -$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIREDIS_DBG))) +LIBSAIREDIS_DBGSYM = $(LIBSAIREDIS_NAME)-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb +$(LIBSAIREDIS_DBGSYM)_DEPENDS += $(LIBSAIREDIS) +$(LIBSAIREDIS_DBGSYM)_RDEPENDS += $(LIBSAIREDIS) +$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIREDIS_DBGSYM))) -LIBSAIVS_DBG = libsaivs-dbg_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb -$(LIBSAIVS_DBG)_DEPENDS += $(LIBSAIVS) -$(LIBSAIVS_DBG)_RDEPENDS += $(LIBSAIVS) -$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DBG))) +LIBSAIVS_DBGSYM = libsaivs-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb +$(LIBSAIVS_DBGSYM)_DEPENDS += $(LIBSAIVS) +$(LIBSAIVS_DBGSYM)_RDEPENDS += $(LIBSAIVS) +$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DBGSYM))) -LIBSAIMETADATA_DBG = libsaimetadata-dbg_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb -$(LIBSAIMETADATA_DBG)_DEPENDS += $(LIBSAIMETADATA) -$(LIBSAIMETADATA_DBG)_RDEPENDS += $(LIBSAIMETADATA) -$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DBG))) +LIBSAIMETADATA_DBGSYM = libsaimetadata-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb +$(LIBSAIMETADATA_DBGSYM)_DEPENDS += $(LIBSAIMETADATA) +$(LIBSAIMETADATA_DBGSYM)_RDEPENDS += $(LIBSAIMETADATA) +$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DBGSYM))) ifeq ($(ENABLE_PY2_MODULES), n) $(LIBSAIREDIS)_DEB_BUILD_PROFILES += nopython2 diff --git a/rules/syncd.mk b/rules/syncd.mk index 6aa3e990843a..2f5cce6cebff 100644 --- a/rules/syncd.mk +++ b/rules/syncd.mk @@ -4,7 +4,7 @@ ifneq ($(CONFIGURED_PLATFORM),vs) SYNCD = syncd_1.0.0_$(CONFIGURED_ARCH).deb $(SYNCD)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) -$(SYNCD)_DPKG_TARGET = binary-syncd +$(SYNCD)_DEB_BUILD_PROFILES += syncd $(SYNCD)_SRC_PATH = $(SRC_PATH)/sonic-sairedis $(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBSAIREDIS) $(SYNCD)_RDEPENDS += $(LIBSWSSCOMMON) @@ -18,19 +18,19 @@ $(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC))) # Inject libthrift build dependency for RPC build $(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV) -$(SYNCD)_DPKG_TARGET = binary-syncd-rpc +$(SYNCD)_DEB_BUILD_PROFILES += rpc endif -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))) +SYNCD_DBGSYM = syncd-dbgsym_1.0.0_$(CONFIGURED_ARCH).deb +$(SYNCD_DBGSYM)_DEPENDS += $(SYNCD) +$(SYNCD_DBGSYM)_RDEPENDS += $(SYNCD) +$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_DBGSYM))) ifeq ($(ENABLE_SYNCD_RPC),y) -SYNCD_RPC_DBG = syncd-rpc-dbg_1.0.0_$(CONFIGURED_ARCH).deb -$(SYNCD_RPC_DBG)_DEPENDS += $(SYNCD_RPC) -$(SYNCD_RPC_DBG)_RDEPENDS += $(SYNCD_RPC) -$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC_DBG))) +SYNCD_RPC_DBGSYM = syncd-rpc-dbgsym_1.0.0_$(CONFIGURED_ARCH).deb +$(SYNCD_RPC_DBGSYM)_DEPENDS += $(SYNCD_RPC) +$(SYNCD_RPC_DBGSYM)_RDEPENDS += $(SYNCD_RPC) +$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC_DBGSYM))) endif ifeq ($(ENABLE_PY2_MODULES), n) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index 14a863a6d8f2..ce8f642271ce 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 14a863a6d8f2855a7cebf1b7e62bc46dbed76ff6 +Subproject commit ce8f642271cee813805d6879041dbcf0c0dac381