forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <sarcot@microsoft.com>
- Loading branch information
1 parent
4681703
commit afa5419
Showing
4 changed files
with
28 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule sonic-sairedis
updated
18 files
+2 −2 | .azure-pipelines/build-template.yml | |
+5 −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 | |
+23 −61 | 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 |