[bcm-genl] Restore DCBDIR path fallback#38
Open
Gfrom2016 wants to merge 1 commit into
Open
Conversation
sdk-6.5.35-xgs unconditionally errors when DCBDIR is unset, which breaks the SONiC opennsl-modules deb build (debian/rules does not pass DCBDIR). sdk-6.5.34-xgs and earlier branches default DCBDIR to \/systems/linux/kernel/modules/dcb -- restore that pattern here so the SONiC build can clean/compile bcm-genl without external configuration. Signed-off-by: zitingguo <zitingguo@microsoft.com>
|
/azp run |
|
No pipelines are associated with this pull request. |
Gfrom2016
added a commit
to Gfrom2016/sonic-buildimage
that referenced
this pull request
May 22, 2026
… 15.2 - saibcm-modules: point to sdk-6.5.35-xgs HEAD (b9b3879) which includes the bcm-genl DCBDIR path fallback restoration (sonic-net/saibcm-modules#38). - sai-modules.mk: bump BRCM_OPENNSL_KERNEL_VERSION 14.3.0.0.0.0.0.0 -> 15.2.0.0.0.0.0.0 to match the SAI 15.2 / SDK 6.5.35 upgrade. Signed-off-by: zitingguo <zitingguo@microsoft.com>
7 tasks
Gfrom2016
added a commit
to Gfrom2016/sonic-buildimage
that referenced
this pull request
May 27, 2026
… 15.2 - saibcm-modules: point to sdk-6.5.35-xgs HEAD (b9b3879) which includes the bcm-genl DCBDIR path fallback restoration (sonic-net/saibcm-modules#38). - sai-modules.mk: bump BRCM_OPENNSL_KERNEL_VERSION 14.3.0.0.0.0.0.0 -> 15.2.0.0.0.0.0.0 to match the SAI 15.2 / SDK 6.5.35 upgrade. Signed-off-by: zitingguo <zitingguo@microsoft.com>
Gfrom2016
added a commit
to Gfrom2016/sonic-buildimage
that referenced
this pull request
Jun 2, 2026
… 15.2 - saibcm-modules: point to sdk-6.5.35-xgs HEAD (b9b3879) which includes the bcm-genl DCBDIR path fallback restoration (sonic-net/saibcm-modules#38). - sai-modules.mk: bump BRCM_OPENNSL_KERNEL_VERSION 14.3.0.0.0.0.0.0 -> 15.2.0.0.0.0.0.0 to match the SAI 15.2 / SDK 6.5.35 upgrade. Signed-off-by: zitingguo <zitingguo@microsoft.com>
StormLiangMS
pushed a commit
to sonic-net/sonic-buildimage
that referenced
this pull request
Jun 3, 2026
* [Broadcom] Bump XGS SAI to 15.2.0 / SDK 6.5.35 Update XGS SAI version to 15.2.0.0.0.0.0.0 (branch SAI_15.2.0_GA) and bump the saibcm-modules submodule pointer to the sdk-6.5.35-xgs branch HEAD. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: register libsaibcm only in trixie BLDENV SAI 15.2 libsaibcm is built against Debian trixie (requires libc6>=2.38, libstdc++6>=14, libprotobuf32t64) and cannot be installed in the bookworm sonic-slave. Wrap the package registration in ifeq($(BLDENV),trixie) so SONIC_ONLINE_DEBS only picks it up in the trixie pass, matching the rules/sonic-redfish.mk pattern. docker-syncd-brcm already uses docker-config-engine-trixie and consumes libsaibcm from target/debs/trixie/. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: keep 14.3 in bookworm pass, 15.2 in trixie pass SAI 15.2 debs are built against trixie (libc6 >= 2.38, libstdc++6 >= 14, libprotobuf32t64) and cannot install in the bookworm slave. The final SONiC image is trixie-based (IMAGE_DISTRO=trixie), so production artifacts use 15.2. The bookworm pass keeps building SAI 14.3 for transitional artifacts (e.g. the syncd binary baked into gearbox containers gbsyncd-broncos/milleniob/agera2) until broadcom is fully migrated to trixie. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [broadcom] Bump saibcm-modules submodule + opennsl-modules version to 15.2 - saibcm-modules: point to sdk-6.5.35-xgs HEAD (b9b3879) which includes the bcm-genl DCBDIR path fallback restoration (sonic-net/saibcm-modules#38). - sai-modules.mk: bump BRCM_OPENNSL_KERNEL_VERSION 14.3.0.0.0.0.0.0 -> 15.2.0.0.0.0.0.0 to match the SAI 15.2 / SDK 6.5.35 upgrade. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: bump bookworm 14.3 version to .16.0 to match master Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: remove bookworm conditional, use 15.2 unconditionally Broadcom containers have been fully migrated to trixie (see PRs #27563 and #26898), so the bookworm/trixie BLDENV conditional in sai-xgs.mk is no longer needed. Use SAI 15.2.0_GA unconditionally. Signed-off-by: zitingguo <zitingguo@microsoft.com> --------- Signed-off-by: zitingguo <zitingguo@microsoft.com>
purush-nexthop
pushed a commit
to nexthop-ai/sonic-buildimage
that referenced
this pull request
Jun 10, 2026
* [Broadcom] Bump XGS SAI to 15.2.0 / SDK 6.5.35 Update XGS SAI version to 15.2.0.0.0.0.0.0 (branch SAI_15.2.0_GA) and bump the saibcm-modules submodule pointer to the sdk-6.5.35-xgs branch HEAD. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: register libsaibcm only in trixie BLDENV SAI 15.2 libsaibcm is built against Debian trixie (requires libc6>=2.38, libstdc++6>=14, libprotobuf32t64) and cannot be installed in the bookworm sonic-slave. Wrap the package registration in ifeq($(BLDENV),trixie) so SONIC_ONLINE_DEBS only picks it up in the trixie pass, matching the rules/sonic-redfish.mk pattern. docker-syncd-brcm already uses docker-config-engine-trixie and consumes libsaibcm from target/debs/trixie/. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: keep 14.3 in bookworm pass, 15.2 in trixie pass SAI 15.2 debs are built against trixie (libc6 >= 2.38, libstdc++6 >= 14, libprotobuf32t64) and cannot install in the bookworm slave. The final SONiC image is trixie-based (IMAGE_DISTRO=trixie), so production artifacts use 15.2. The bookworm pass keeps building SAI 14.3 for transitional artifacts (e.g. the syncd binary baked into gearbox containers gbsyncd-broncos/milleniob/agera2) until broadcom is fully migrated to trixie. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [broadcom] Bump saibcm-modules submodule + opennsl-modules version to 15.2 - saibcm-modules: point to sdk-6.5.35-xgs HEAD (b9b3879) which includes the bcm-genl DCBDIR path fallback restoration (sonic-net/saibcm-modules#38). - sai-modules.mk: bump BRCM_OPENNSL_KERNEL_VERSION 14.3.0.0.0.0.0.0 -> 15.2.0.0.0.0.0.0 to match the SAI 15.2 / SDK 6.5.35 upgrade. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: bump bookworm 14.3 version to .16.0 to match master Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: remove bookworm conditional, use 15.2 unconditionally Broadcom containers have been fully migrated to trixie (see PRs sonic-net#27563 and sonic-net#26898), so the bookworm/trixie BLDENV conditional in sai-xgs.mk is no longer needed. Use SAI 15.2.0_GA unconditionally. Signed-off-by: zitingguo <zitingguo@microsoft.com> --------- Signed-off-by: zitingguo <zitingguo@microsoft.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
sdk-6.5.35-xgs unconditionally errors when
DCBDIRis unset, which breaks the SONiCopennsl-modulesdeb build becausedebian/rulesdoes not passDCBDIRto the kernel-module make invocations:Makefile:38: *** 'The $DCBDIR variable is not set'. Stop. make[5]: *** [.../Make.subdirs:40: bcm-genl] Error 2How
Restore the same path fallback that sdk-6.5.34-xgs and prior branches use:
ifndef DCBDIR / DCBDIR = $(SDK)/systems/linux/kernel/modules/dcb / endifThe
dcb/source tree exists in this branch so the fallback path is valid. No behavior change for callers that already set DCBDIR; restores buildability when it's unset.Test
CI verification on sonic-net/sonic-buildimage#27465.
Signed-off-by: zitingguo zitingguo@microsoft.com