Update sairedis submodule

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. Signed-off-by: Saikrishna Arcot <[email protected]>
sonic-net · Jul 21, 2023 · 1510892 · 1510892
1 parent bb99552
commit 1510892
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
+2 −2		.azure-pipelines/build-template.yml
+1 −1		.azure-pipelines/docker-sonic-vs/Dockerfile
+5 −3		.azure-pipelines/test-docker-sonic-vs-template.yml
+14 −8		.github/workflows/codeql-analysis.yml
+27 −1		configure.ac
+1 −1		debian/compat
+12 −58		debian/control
+2 −0		debian/libsaimetadata-dev.install
+1 −0		debian/libsairedis-dev.install
+24 −57		debian/rules
+327 −0		m4/ax_python3_devel.m4
+2 −2		meta/Makefile.am
+4 −1		pyext/Makefile.am
+2 −2		pyext/py2/Makefile.am
+1 −1		pyext/py3/Makefile.am
+1 −0		tests/aspell.en.pws
+20 −3		vslib/SwitchConfig.cpp
+1 −0		vslib/saivs.h