Skip to content

Fixed some dbg package naming issues #133

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.

Sign up for GitHub

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

Open
linqingxuan wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fixed some dbg package naming issues #133

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f670015
Fixed some dbg package naming issues
linqingxuan Nov 4, 2024
0b927fb
Change the reference to the dbg package to dbgsym
linqingxuan Nov 6, 2024
8df6c29
Merge branch 'main' into fix-dbg-naming-issues
yue-fred-gao Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions platform/mkrules/rules/sairedis.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ LIBSAIMETADATA_DEV = libsaimetadata-dev_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH
$(LIBSAIMETADATA_DEV)_DEPENDS += $(LIBSAIMETADATA)
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DEV)))

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)))
LIBSAIREDIS_DBG = $(LIBSAIREDIS_NAME)-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb

@VladimirKuk VladimirKuk Nov 4, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want to make consistent naming across the code, I'd suggest to also rename swss-dbg_1.0.0_amd64.deb to swss-dbgsym_1.0.0_amd64.deb

@linqingxuan linqingxuan Nov 5, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean to add "sym" to the reference? I have considered this, but I have seen that the official designs of different platforms all remove "sym". I suggest that we gradually remove sym in the makefile, so that it will be easier to follow up the community version upgrade later.

@VladimirKuk VladimirKuk Nov 5, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was under impression that it is the other way.
I've looked at the rules directory and there most of the packages using dbgsym, and most of the "dbg" usage is by dockers.

@linqingxuan linqingxuan Nov 5, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So a better way is to change it to use dbgsym naming, I will submit the modification next time

$(LIBSAIREDIS_DBG)_DEPENDS += $(LIBSAIREDIS)
$(LIBSAIREDIS_DBG)_RDEPENDS += $(LIBSAIREDIS)
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIREDIS_DBG))

LIBSAIVPP_DBGSYM = libsaivpp-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
$(LIBSAIVPP_DBGSYM)_DEPENDS += $(LIBSAIVPP)
$(LIBSAIVPP_DBGSYM)_RDEPENDS += $(LIBSAIVPP)
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVPP_DBGSYM)))
LIBSAIVPP_DBG = libsaivpp-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
$(LIBSAIVPP_DBG)_DEPENDS += $(LIBSAIVPP)
$(LIBSAIVPP_DBG)_RDEPENDS += $(LIBSAIVPP)
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVPP_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)))
LIBSAIMETADATA_DBG = libsaimetadata-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
$(LIBSAIMETADATA_DBG)_DEPENDS += $(LIBSAIMETADATA)
$(LIBSAIMETADATA_DBG)_RDEPENDS += $(LIBSAIMETADATA)
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DBG)))

ifeq ($(ENABLE_PY2_MODULES), n)
$(LIBSAIREDIS)_DEB_BUILD_PROFILES += nopython2
Expand Down
6 changes: 3 additions & 3 deletions rules/syncd-vpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
SYNCD_VPP = syncd-vpp_1.0.0_amd64.deb
$(SYNCD_VPP)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBSAIVPP)

SYNCD_VPP_DBGSYM = syncd-vpp-dbgsym_1.0.0_amd64.deb
$(SYNCD_VPP_DBGSYM)_DEPENDS += $(SYNCD_VPP)
$(SYNCD_VPP_DBGSYM)_RDEPENDS += $(SYNCD_VPP)
SYNCD_VPP_DBG = syncd-vpp-dbgsym_1.0.0_amd64.deb
$(SYNCD_VPP_DBG)_DEPENDS += $(SYNCD_VPP)
$(SYNCD_VPP_DBG)_RDEPENDS += $(SYNCD_VPP)