From 1ca75d320f105f8eb6265c04a63763ac71b553be Mon Sep 17 00:00:00 2001
From: "arheneus@marvell.com"
 <51254330+antony-rheneus@users.noreply.github.com>
Date: Fri, 2 Aug 2019 04:55:09 +0530
Subject: [PATCH] [Makefile] multi arch variable fix (#3263)

Signed-off-by: Antony Rheneus <arheneus@marvell.com>
---
 rules/frr.mk      | 4 ++--
 rules/isc-dhcp.mk | 2 +-
 rules/libyang.mk  | 2 +-
 rules/lldpd.mk    | 2 +-
 rules/radvd.mk    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rules/frr.mk b/rules/frr.mk
index b71b4eaa89..a14d398f89 100644
--- a/rules/frr.mk
+++ b/rules/frr.mk
@@ -18,10 +18,10 @@ $(eval $(call add_derived_package,$(FRR),$(FRR_PYTHONTOOLS)))
 FRR_DBG = frr-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(FRR),$(FRR_DBG)))
 
-FRR_SNMP = frr-snmp_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_amd64.deb
+FRR_SNMP = frr-snmp_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(FRR),$(FRR_SNMP)))
 
-FRR_SNMP_DBG = frr-snmp-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_amd64.deb
+FRR_SNMP_DBG = frr-snmp-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(FRR),$(FRR_SNMP_DBG)))
 
 export FRR FRR_PYTHONTOOLS FRR_DBG FRR_SNMP FRR_SNMP_DBG
diff --git a/rules/isc-dhcp.mk b/rules/isc-dhcp.mk
index 4507cc5694..da57d08771 100644
--- a/rules/isc-dhcp.mk
+++ b/rules/isc-dhcp.mk
@@ -10,5 +10,5 @@ SONIC_MAKE_DEBS += $(ISC_DHCP_RELAY)
 
 SONIC_STRETCH_DEBS += $(ISC_DHCP_RELAY)
 
-ISC_DHCP_RELAY_DBG = isc-dhcp-relay-dbgsym_$(ISC_DHCP_VERSION)_amd64.deb
+ISC_DHCP_RELAY_DBG = isc-dhcp-relay-dbgsym_$(ISC_DHCP_VERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(ISC_DHCP_RELAY),$(ISC_DHCP_RELAY_DBG)))
diff --git a/rules/libyang.mk b/rules/libyang.mk
index 117564ed6e..2561be6b71 100644
--- a/rules/libyang.mk
+++ b/rules/libyang.mk
@@ -17,7 +17,7 @@ SONIC_STRETCH_DEBS += $(LIBYANG)
 LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DEV)))
 
-LIBYANG_DBG = libyang$(LIBYANG_VERSION_BASE)-dbgsym_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_amd64.deb
+LIBYANG_DBG = libyang$(LIBYANG_VERSION_BASE)-dbgsym_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DBG)))
 
 export LIBYANG LIBYANG_DEV LIBYANG_DBG
diff --git a/rules/lldpd.mk b/rules/lldpd.mk
index da24d74587..bae83f7263 100644
--- a/rules/lldpd.mk
+++ b/rules/lldpd.mk
@@ -13,7 +13,7 @@ SONIC_MAKE_DEBS += $(LLDPD)
 LIBLLDPCTL = liblldpctl-dev_$(LLDPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LLDPD),$(LIBLLDPCTL)))
 
-LLDPD_DBG = lldpd-dbgsym_$(LLDPD_VERSION_FULL)_amd64.deb
+LLDPD_DBG = lldpd-dbgsym_$(LLDPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LLDPD),$(LLDPD_DBG)))
 
 # Export these variables so they can be used in a sub-make
diff --git a/rules/radvd.mk b/rules/radvd.mk
index a3bd802e52..fcde8c5767 100644
--- a/rules/radvd.mk
+++ b/rules/radvd.mk
@@ -9,7 +9,7 @@ $(RADVD)_SRC_PATH = $(SRC_PATH)/radvd
 SONIC_MAKE_DEBS += $(RADVD)
 SONIC_STRETCH_DEBS += $(RADVD)
 
-RADVD_DBG = radvd-dbgsym_$(RADVD_VERSION)_amd64.deb
+RADVD_DBG = radvd-dbgsym_$(RADVD_VERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(RADVD),$(RADVD_DBG)))
 
 # The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}