From f6700150ef96148fc7cee25d82c922965da09e80 Mon Sep 17 00:00:00 2001 From: linxiaohao Date: Mon, 4 Nov 2024 14:44:30 +0800 Subject: [PATCH 1/2] Fixed some dbg package naming issues * Fix LIBSAIREDIS_DBG naming issues * Fix SYNCD_VPP_DBG naming issues --- platform/mkrules/rules/sairedis.mk | 24 ++++++++++++------------ rules/syncd-vpp.mk | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/platform/mkrules/rules/sairedis.mk b/platform/mkrules/rules/sairedis.mk index ab17ddb..0496bde 100644 --- a/platform/mkrules/rules/sairedis.mk +++ b/platform/mkrules/rules/sairedis.mk @@ -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 +$(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 diff --git a/rules/syncd-vpp.mk b/rules/syncd-vpp.mk index 122d895..6d9d250 100644 --- a/rules/syncd-vpp.mk +++ b/rules/syncd-vpp.mk @@ -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) From 0b927fb1dc2279128c9ccab8f8c12a51b42034da Mon Sep 17 00:00:00 2001 From: linxiaohao Date: Wed, 6 Nov 2024 09:45:01 +0800 Subject: [PATCH 2/2] Change the reference to the dbg package to dbgsym - Change the docker rule variable name to the correct gbdsym --- platform/mkrules/rules/sairedis.mk | 24 ++++++++++++------------ rules/docker-gbsyncd-vpp.mk | 8 ++++---- rules/docker-sonic-vpp.mk | 6 +++--- rules/docker-syncd-vpp.mk | 8 ++++---- rules/syncd-vpp.dep | 2 +- rules/syncd-vpp.mk | 6 +++--- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/platform/mkrules/rules/sairedis.mk b/platform/mkrules/rules/sairedis.mk index 0496bde..ab17ddb 100644 --- a/platform/mkrules/rules/sairedis.mk +++ b/platform/mkrules/rules/sairedis.mk @@ -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_DBG = $(LIBSAIREDIS_NAME)-dbgsym_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb -$(LIBSAIREDIS_DBG)_DEPENDS += $(LIBSAIREDIS) -$(LIBSAIREDIS_DBG)_RDEPENDS += $(LIBSAIREDIS) -$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIREDIS_DBG)) +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))) -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))) +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))) -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))) +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))) ifeq ($(ENABLE_PY2_MODULES), n) $(LIBSAIREDIS)_DEB_BUILD_PROFILES += nopython2 diff --git a/rules/docker-gbsyncd-vpp.mk b/rules/docker-gbsyncd-vpp.mk index 36c9600..a18b4aa 100644 --- a/rules/docker-gbsyncd-vpp.mk +++ b/rules/docker-gbsyncd-vpp.mk @@ -20,11 +20,11 @@ include $(PLATFORM_PATH)/../template/docker-gbsyncd-bookworm.mk $(DOCKER_GBSYNCD_BASE)_DEPENDS += $(LIBSAIVPP) \ $(SYNCD) -$(DOCKER_GBSYNCD_BASE)_DBG_DEPENDS += $(SYNCD_VPP_DBG) \ +$(DOCKER_GBSYNCD_BASE)_DBG_DEPENDS += $(SYNCD_VPP_DBGSYM) \ $(LIBSWSSCOMMON_DBG) \ - $(LIBSAIMETADATA_DBG) \ - $(LIBSAIREDIS_DBG) \ - $(LIBSAIVPP_DBG) + $(LIBSAIMETADATA_DBSYM) \ + $(LIBSAIREDIS_DBGSYM) \ + $(LIBSAIVPP_DBGSYM) $(DOCKER_GBSYNCD_BASE)_VERSION = 1.0.0 $(DOCKER_GBSYNCD_BASE)_PACKAGE_NAME = gbsyncd diff --git a/rules/docker-sonic-vpp.mk b/rules/docker-sonic-vpp.mk index 131a275..d0f38f2 100644 --- a/rules/docker-sonic-vpp.mk +++ b/rules/docker-sonic-vpp.mk @@ -43,9 +43,9 @@ $(DOCKER_SONIC_VPP)_PYTHON_WHEELS += $(SWSSSDK_PY3) \ ifeq ($(INSTALL_DEBUG_TOOLS), y) $(DOCKER_SONIC_VPP)_DEPENDS += $(LIBSWSSCOMMON_DBG) \ - $(LIBSAIREDIS_DBG) \ - $(LIBSAIVPP_DBG) \ - $(SYNCD_VPP_DBG) + $(LIBSAIREDIS_DBGSYM) \ + $(LIBSAIVPP_DBGSYM) \ + $(SYNCD_VPP_DBGSYM) endif $(DOCKER_SONIC_VPP)_FILES += $(CONFIGDB_LOAD_SCRIPT) \ diff --git a/rules/docker-syncd-vpp.mk b/rules/docker-syncd-vpp.mk index 22da013..0bfae7b 100644 --- a/rules/docker-syncd-vpp.mk +++ b/rules/docker-syncd-vpp.mk @@ -35,11 +35,11 @@ $(DOCKER_SYNCD_BASE)_DEPENDS += $(LIBSAIVPP) \ $(SYNCD)_DEPENDS += $(LIBSAIVPP) $(LIBSAIVPP_DEV) -$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \ +$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_VPP_DBGSYM) \ $(LIBSWSSCOMMON_DBG) \ - $(LIBSAIMETADATA_DBG) \ - $(LIBSAIREDIS_DBG) \ - $(LIBSAIVPP_DBG) + $(LIBSAIMETADATA_DBGSYM) \ + $(LIBSAIREDIS_DBGSYM) \ + $(LIBSAIVPP_DBGSYM) $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0 $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd diff --git a/rules/syncd-vpp.dep b/rules/syncd-vpp.dep index efb4670..b7b1a9a 100644 --- a/rules/syncd-vpp.dep +++ b/rules/syncd-vpp.dep @@ -35,4 +35,4 @@ $(SYNCD_VPP)_CACHE_MODE := GIT_CONTENT_SHA $(SYNCD_VPP)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(SYNCD_VPP)_DEP_FILES := $(DEP_FILES) -$(eval $(call add_dbg_docker,$(SYNCD_VPP),$(SYNCD_VPP_DBG))) +$(eval $(call add_dbg_docker,$(SYNCD_VPP),$(SYNCD_VPP_DBGSYM))) diff --git a/rules/syncd-vpp.mk b/rules/syncd-vpp.mk index 6d9d250..122d895 100644 --- a/rules/syncd-vpp.mk +++ b/rules/syncd-vpp.mk @@ -17,6 +17,6 @@ SYNCD_VPP = syncd-vpp_1.0.0_amd64.deb $(SYNCD_VPP)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBSAIVPP) -SYNCD_VPP_DBG = syncd-vpp-dbgsym_1.0.0_amd64.deb -$(SYNCD_VPP_DBG)_DEPENDS += $(SYNCD_VPP) -$(SYNCD_VPP_DBG)_RDEPENDS += $(SYNCD_VPP) +SYNCD_VPP_DBGSYM = syncd-vpp-dbgsym_1.0.0_amd64.deb +$(SYNCD_VPP_DBGSYM)_DEPENDS += $(SYNCD_VPP) +$(SYNCD_VPP_DBGSYM)_RDEPENDS += $(SYNCD_VPP)