Skip to content

Commit 53d8b1a

Browse files
authored
Fix debug package variables for syncd (#18319)
* 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 <[email protected]> * Update sairedis.mk as well Signed-off-by: Saikrishna Arcot <[email protected]> --------- Signed-off-by: Saikrishna Arcot <[email protected]>
1 parent 8399450 commit 53d8b1a

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

platform/vs/syncd-vs.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SYNCD_VS = syncd-vs_1.0.0_$(CONFIGURED_ARCH).deb
44
$(SYNCD_VS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBSAIVS)
55
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS)))
66

7-
SYNCD_VS_DBGSYM = syncd-vs-dbgsym_1.0.0_$(CONFIGURED_ARCH).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)))
7+
SYNCD_VS_DBG = syncd-vs-dbgsym_1.0.0_$(CONFIGURED_ARCH).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)))

rules/sairedis.mk

+14-14
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@ LIBSAIMETADATA_DEV = libsaimetadata-dev_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH
2929
$(LIBSAIMETADATA_DEV)_DEPENDS += $(LIBSAIMETADATA)
3030
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DEV)))
3131

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)))
36-
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)))
41-
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)))
32+
LIBSAIREDIS_DBG = $(LIBSAIREDIS_NAME)-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
33+
$(LIBSAIREDIS_DBG)_DEPENDS += $(LIBSAIREDIS)
34+
$(LIBSAIREDIS_DBG)_RDEPENDS += $(LIBSAIREDIS)
35+
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIREDIS_DBG)))
36+
37+
LIBSAIVS_DBG = libsaivs-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
38+
$(LIBSAIVS_DBG)_DEPENDS += $(LIBSAIVS)
39+
$(LIBSAIVS_DBG)_RDEPENDS += $(LIBSAIVS)
40+
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DBG)))
41+
42+
LIBSAIMETADATA_DBG = libsaimetadata-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb
43+
$(LIBSAIMETADATA_DBG)_DEPENDS += $(LIBSAIMETADATA)
44+
$(LIBSAIMETADATA_DBG)_RDEPENDS += $(LIBSAIMETADATA)
45+
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DBG)))
4646

4747
ifeq ($(ENABLE_PY2_MODULES), n)
4848
$(LIBSAIREDIS)_DEB_BUILD_PROFILES += nopython2

rules/syncd.mk

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ $(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV)
2121
$(SYNCD)_DEB_BUILD_PROFILES += rpc
2222
endif
2323

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)))
24+
SYNCD_DBG = syncd-dbgsym_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)))
2828

2929
ifeq ($(ENABLE_SYNCD_RPC),y)
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)))
30+
SYNCD_RPC_DBG = syncd-rpc-dbgsym_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)))
3434
endif
3535

3636
ifeq ($(ENABLE_PY2_MODULES), n)

0 commit comments

Comments
 (0)