Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sairedis submodule #16072

Merged
merged 2 commits into from
Aug 11, 2023

Conversation

saiarcot895
Copy link
Contributor

@saiarcot895 saiarcot895 commented Aug 7, 2023

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 #15720, which was reverted in #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:

eb24302 Build both the regular and RPC version when the RPC profile is enabled (#1273)
9e855c2 [FEC] Adding support for vs testing for SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE (#1271)
4dbdb21 Fix RPC package build failure due to shell syntax issue (#1268)
588d596 Make sure new binaries replace existing binaries in docker-sonic-vs (#1269)
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)

Why I did it

Work item tracking
  • Microsoft ADO (number only): 24405994

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

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>
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@dgsudharsan
Copy link
Collaborator

@qiluo-msft Can you please review and signoff this PR? There are other commits in sonic-sairedis submodule that is needed for swss sonic-net/sonic-swss#2874 PR checker to succeed

@yxieca yxieca merged commit 519a1e4 into sonic-net:master Aug 11, 2023
16 checks passed
@saiarcot895 saiarcot895 deleted the reland-sairedis-submodule-update branch August 11, 2023 18:53
sonic-otn pushed a commit to sonic-otn/sonic-buildimage that referenced this pull request Sep 20, 2023
* 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 <sarcot@microsoft.com>

* Update sairedis submodule with the fix for the RPC package build

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

---------

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@k-v1
Copy link
Contributor

k-v1 commented Mar 4, 2024

@saiarcot895
In this PR you renamed SYNCD_DBG to SYNCD_DBGSYM, LIBSAIVS_DBG to LIBSAIVS_DBGSYM, LIBSAIMETADATA_DBG to LIBSAIMETADATA_DBGSYM etc. But you haven't changed these make variables in other files (especially in platform directory). Maybe it's more correct to rename them back to _DBG:

- LIBSAIVS_DBGSYM = libsaivs-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
+ LIBSAIVS_DBG = libsaivs-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb

saiarcot895 added a commit to saiarcot895/sonic-buildimage that referenced this pull request Mar 11, 2024
PR sonic-net#16072 renamed the debug package variables from `*_DBG` to
`*_DBGSYM`, since the package names had changed. However, the references
weren't updated. Since all the other debug packages (including ones that
are named `*-dbgsym`) use `*_DBG`, just use that here as well.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
yxieca pushed a commit that referenced this pull request Mar 19, 2024
* Fix debug package variables for syncd

PR #16072 renamed the debug package variables from `*_DBG` to
`*_DBGSYM`, since the package names had changed. However, the references
weren't updated. Since all the other debug packages (including ones that
are named `*-dbgsym`) use `*_DBG`, just use that here as well.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Update sairedis.mk as well

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

---------

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Mar 19, 2024
* Fix debug package variables for syncd

PR sonic-net#16072 renamed the debug package variables from `*_DBG` to
`*_DBGSYM`, since the package names had changed. However, the references
weren't updated. Since all the other debug packages (including ones that
are named `*-dbgsym`) use `*_DBG`, just use that here as well.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Update sairedis.mk as well

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

---------

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
mssonicbld pushed a commit that referenced this pull request Mar 19, 2024
* Fix debug package variables for syncd

PR #16072 renamed the debug package variables from `*_DBG` to
`*_DBGSYM`, since the package names had changed. However, the references
weren't updated. Since all the other debug packages (including ones that
are named `*-dbgsym`) use `*_DBG`, just use that here as well.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Update sairedis.mk as well

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

---------

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants