matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Makefile] multi arch variable fix (#3263)

Browse Source 
Signed-off-by: Antony Rheneus <arheneus@marvell.com>
This commit is contained in:
arheneus@marvell.com 2019-08-02 04:55:09 +05:30 committed by lguohan
parent 9a418e34dd
commit 1ca75d320f
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rules/frr.mk
View File

@ -18,10 +18,10 @@ $(eval $(call add_derived_package,$(FRR),$(FRR_PYTHONTOOLS)))
FRR_DBG = frr-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb FRR_DBG = frr-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(FRR),$(FRR_DBG))) $(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))) $(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))) $(eval $(call add_derived_package,$(FRR),$(FRR_SNMP_DBG)))
export FRR FRR_PYTHONTOOLS FRR_DBG FRR_SNMP FRR_SNMP_DBG export FRR FRR_PYTHONTOOLS FRR_DBG FRR_SNMP FRR_SNMP_DBG

2
rules/isc-dhcp.mk
View File

@ -10,5 +10,5 @@ SONIC_MAKE_DEBS += $(ISC_DHCP_RELAY)
SONIC_STRETCH_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))) $(eval $(call add_derived_package,$(ISC_DHCP_RELAY),$(ISC_DHCP_RELAY_DBG)))

2
rules/libyang.mk
View File

@ -17,7 +17,7 @@ SONIC_STRETCH_DEBS += $(LIBYANG)
LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_$(CONFIGURED_ARCH).deb LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DEV))) $(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))) $(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DBG)))
export LIBYANG LIBYANG_DEV LIBYANG_DBG export LIBYANG LIBYANG_DEV LIBYANG_DBG

2
rules/lldpd.mk
View File

@ -13,7 +13,7 @@ SONIC_MAKE_DEBS += $(LLDPD)
LIBLLDPCTL = liblldpctl-dev_$(LLDPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb LIBLLDPCTL = liblldpctl-dev_$(LLDPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LLDPD),$(LIBLLDPCTL))) $(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))) $(eval $(call add_derived_package,$(LLDPD),$(LLDPD_DBG)))
# Export these variables so they can be used in a sub-make # Export these variables so they can be used in a sub-make

2
rules/radvd.mk
View File

@ -9,7 +9,7 @@ $(RADVD)_SRC_PATH = $(SRC_PATH)/radvd
SONIC_MAKE_DEBS += $(RADVD) SONIC_MAKE_DEBS += $(RADVD)
SONIC_STRETCH_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))) $(eval $(call add_derived_package,$(RADVD),$(RADVD_DBG)))
# The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list} # The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}