Skip to content

Commit afa5419

Browse files
committed
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. This is a reland of sonic-net#15720, which was reverted in sonic-net#15995 due to the RPC package build failing. That failure has since been fixed, and the PR pipeline has been updated to build the RPC package so that this is checked at the PR stage. This submodule update brings in the following changes: ``` 4dbdb21 Fix RPC package build failure due to shell syntax issue (sonic-net#1268) 588d596 Make sure new binaries replace existing binaries in docker-sonic-vs (sonic-net#1269) ce8f642 [vs] Use boost join to concatenate switch types in config (sonic-net#1266) d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (sonic-net#1259) e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (sonic-net#1262) c08f9a2 [CI]: Fix collect log error in azp template. (sonic-net#1260) eed856c [CodeQL]: Fix syncd compilation in azp template. (sonic-net#1261) a3f1f1a Reland 'Make changes to building and packaging sairedis (sonic-net#1116)' (sonic-net#1194) ``` Signed-off-by: Saikrishna Arcot <[email protected]>
1 parent 4681703 commit afa5419

File tree

4 files changed

+28
-29
lines changed

4 files changed

+28
-29
lines changed

platform/vs/syncd-vs.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$(LIBSAIREDIS)_DPKG_TARGET = binary-syncd-vs
1+
$(LIBSAIREDIS)_DEB_BUILD_PROFILES += syncd vs
22

33
SYNCD_VS = syncd-vs_1.0.0_amd64.deb
44
$(SYNCD_VS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBSAIVS)
55
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS)))
66

7-
SYNCD_VS_DBG = syncd-vs-dbg_1.0.0_amd64.deb
8-
$(SYNCD_VS_DBG)_DEPENDS += $(SYNCD_VS)
9-
$(SYNCD_VS_DBG)_RDEPENDS += $(SYNCD_VS)
10-
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS_DBG)))
7+
SYNCD_VS_DBGSYM = syncd-vs-dbgsym_1.0.0_amd64.deb
8+
$(SYNCD_VS_DBGSYM)_DEPENDS += $(SYNCD_VS)
9+
$(SYNCD_VS_DBGSYM)_RDEPENDS += $(SYNCD_VS)
10+
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS_DBGSYM)))

rules/sairedis.mk

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ LIBSAIREDIS_VERSION = 1.0.0
44
LIBSAIREDIS_NAME = libsairedis
55

66
LIBSAIREDIS = $(LIBSAIREDIS_NAME)_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
7-
$(LIBSAIREDIS)_DPKG_TARGET = binary-sairedis
87
$(LIBSAIREDIS)_SRC_PATH = $(SRC_PATH)/sonic-sairedis
98
$(LIBSAIREDIS)_VERSION = $(LIBSAIREDIS_VERSION)
109
$(LIBSAIREDIS)_NAME = $(LIBSAIREDIS_NAME)
@@ -30,20 +29,20 @@ LIBSAIMETADATA_DEV = libsaimetadata-dev_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH
3029
$(LIBSAIMETADATA_DEV)_DEPENDS += $(LIBSAIMETADATA)
3130
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DEV)))
3231

33-
LIBSAIREDIS_DBG = $(LIBSAIREDIS_NAME)-dbg_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
34-
$(LIBSAIREDIS_DBG)_DEPENDS += $(LIBSAIREDIS)
35-
$(LIBSAIREDIS_DBG)_RDEPENDS += $(LIBSAIREDIS)
36-
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIREDIS_DBG)))
32+
LIBSAIREDIS_DBGSYM = $(LIBSAIREDIS_NAME)-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
33+
$(LIBSAIREDIS_DBGSYM)_DEPENDS += $(LIBSAIREDIS)
34+
$(LIBSAIREDIS_DBGSYM)_RDEPENDS += $(LIBSAIREDIS)
35+
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIREDIS_DBGSYM)))
3736

38-
LIBSAIVS_DBG = libsaivs-dbg_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
39-
$(LIBSAIVS_DBG)_DEPENDS += $(LIBSAIVS)
40-
$(LIBSAIVS_DBG)_RDEPENDS += $(LIBSAIVS)
41-
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DBG)))
37+
LIBSAIVS_DBGSYM = libsaivs-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
38+
$(LIBSAIVS_DBGSYM)_DEPENDS += $(LIBSAIVS)
39+
$(LIBSAIVS_DBGSYM)_RDEPENDS += $(LIBSAIVS)
40+
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DBGSYM)))
4241

43-
LIBSAIMETADATA_DBG = libsaimetadata-dbg_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
44-
$(LIBSAIMETADATA_DBG)_DEPENDS += $(LIBSAIMETADATA)
45-
$(LIBSAIMETADATA_DBG)_RDEPENDS += $(LIBSAIMETADATA)
46-
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DBG)))
42+
LIBSAIMETADATA_DBGSYM = libsaimetadata-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
43+
$(LIBSAIMETADATA_DBGSYM)_DEPENDS += $(LIBSAIMETADATA)
44+
$(LIBSAIMETADATA_DBGSYM)_RDEPENDS += $(LIBSAIMETADATA)
45+
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DBGSYM)))
4746

4847
ifeq ($(ENABLE_PY2_MODULES), n)
4948
$(LIBSAIREDIS)_DEB_BUILD_PROFILES += nopython2

rules/syncd.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ifneq ($(CONFIGURED_PLATFORM),vs)
44

55
SYNCD = syncd_1.0.0_$(CONFIGURED_ARCH).deb
66
$(SYNCD)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA)
7-
$(SYNCD)_DPKG_TARGET = binary-syncd
7+
$(SYNCD)_DEB_BUILD_PROFILES += syncd
88
$(SYNCD)_SRC_PATH = $(SRC_PATH)/sonic-sairedis
99
$(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBSAIREDIS)
1010
$(SYNCD)_RDEPENDS += $(LIBSWSSCOMMON)
@@ -18,19 +18,19 @@ $(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC)))
1818

1919
# Inject libthrift build dependency for RPC build
2020
$(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV)
21-
$(SYNCD)_DPKG_TARGET = binary-syncd-rpc
21+
$(SYNCD)_DEB_BUILD_PROFILES += rpc
2222
endif
2323

24-
SYNCD_DBG = syncd-dbg_1.0.0_$(CONFIGURED_ARCH).deb
25-
$(SYNCD_DBG)_DEPENDS += $(SYNCD)
26-
$(SYNCD_DBG)_RDEPENDS += $(SYNCD)
27-
$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_DBG)))
24+
SYNCD_DBGSYM = syncd-dbgsym_1.0.0_$(CONFIGURED_ARCH).deb
25+
$(SYNCD_DBGSYM)_DEPENDS += $(SYNCD)
26+
$(SYNCD_DBGSYM)_RDEPENDS += $(SYNCD)
27+
$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_DBGSYM)))
2828

2929
ifeq ($(ENABLE_SYNCD_RPC),y)
30-
SYNCD_RPC_DBG = syncd-rpc-dbg_1.0.0_$(CONFIGURED_ARCH).deb
31-
$(SYNCD_RPC_DBG)_DEPENDS += $(SYNCD_RPC)
32-
$(SYNCD_RPC_DBG)_RDEPENDS += $(SYNCD_RPC)
33-
$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC_DBG)))
30+
SYNCD_RPC_DBGSYM = syncd-rpc-dbgsym_1.0.0_$(CONFIGURED_ARCH).deb
31+
$(SYNCD_RPC_DBGSYM)_DEPENDS += $(SYNCD_RPC)
32+
$(SYNCD_RPC_DBGSYM)_RDEPENDS += $(SYNCD_RPC)
33+
$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC_DBGSYM)))
3434
endif
3535

3636
ifeq ($(ENABLE_PY2_MODULES), n)

0 commit comments

Comments
 (0)