[docker-orchagent]: make build depends only on sairedis package (#6467)
backport c4b5b002c3
make swss build depends only on libsairedis instead of syncd. This allows to build swss without depending
on vendor sai library.
Currently, libsairedis build also buils syncd which requires vendor SAI lib. This makes difficult to build
swss docker in buster while still keeping syncd docker in stretch, as swss requires libsairedis which also
build syncd and requires vendor to provide SAI for buster. As swss docker does not really contain syncd
binary, so it is not necessary to build syncd for swss docker.
[submodule]: update sonic-sairedis
1e42517996bfe41ac58d4c25ee3f93502befcb9d (HEAD -> 201911) [build]: add option to build without syncd
Signed-off-by: Guohan Lu <lguohan@gmail.com>
This commit is contained in:
parent
511541f7f0
commit
8bcdefbc34
@ -6,3 +6,4 @@ $(BFN_SAI)_RDEPENDS += $(LIBNL_GENL3)
|
|||||||
|
|
||||||
SONIC_ONLINE_DEBS += $(BFN_SAI)
|
SONIC_ONLINE_DEBS += $(BFN_SAI)
|
||||||
$(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)
|
$(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)
|
||||||
|
$(BFN_SAI_DEV)_CONFLICTS += $(LIBSAIVS_DEV)
|
||||||
|
@ -19,8 +19,13 @@ include $(PLATFORM_PATH)/bfn-modules.mk
|
|||||||
SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \
|
SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \
|
||||||
$(DOCKER_FPM)
|
$(DOCKER_FPM)
|
||||||
|
|
||||||
# Inject sai into sairedis
|
# Inject sai into syncd
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(BFN_SAI) $(WNC_OSW1800_PLATFORM) $(BFN_INGRASYS_PLATFORM) $(BFN_PLATFORM) #$(LIBSAITHRIFT_DEV_BFN)
|
#$(SYNCD)_DEPENDS += $(BFN_SAI) $(WNC_OSW1800_PLATFORM) $(BFN_INGRASYS_PLATFORM) $(BFN_PLATFORM)
|
||||||
|
$(SYNCD)_DEPENDS += $(BFN_SAI) $(BFN_INGRASYS_PLATFORM) $(BFN_PLATFORM)
|
||||||
|
|
||||||
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
|
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
|
||||||
|
endif
|
||||||
|
|
||||||
# Runtime dependency on sai is set only for syncd
|
# Runtime dependency on sai is set only for syncd
|
||||||
$(SYNCD)_RDEPENDS += $(BFN_SAI) $(WNC_OSW1800_PLATFORM) $(BFN_INGRASYS_PLATFORM) $(BFN_PLATFORM)
|
$(SYNCD)_RDEPENDS += $(BFN_SAI) $(WNC_OSW1800_PLATFORM) $(BFN_INGRASYS_PLATFORM) $(BFN_PLATFORM)
|
||||||
|
@ -32,10 +32,10 @@ SONIC_ONLINE_FILES += $(BCMCMD) $(DSSERVE)
|
|||||||
SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT_IMAGE) \
|
SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT_IMAGE) \
|
||||||
$(DOCKER_FPM)
|
$(DOCKER_FPM)
|
||||||
|
|
||||||
# Inject brcm sai into sairedis
|
# Inject brcm sai into syncd
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)
|
$(SYNCD)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)
|
||||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(LIBSAITHRIFT_DEV)
|
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Runtime dependency on brcm sai is set only for syncd
|
# Runtime dependency on brcm sai is set only for syncd
|
||||||
|
@ -6,3 +6,4 @@ $(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsa
|
|||||||
|
|
||||||
SONIC_ONLINE_DEBS += $(BRCM_SAI)
|
SONIC_ONLINE_DEBS += $(BRCM_SAI)
|
||||||
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
|
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
|
||||||
|
$(BRCM_SAI_DEV)_CONFLICTS += $(LIBSAIVS_DEV)
|
||||||
|
@ -12,10 +12,10 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
|
|||||||
$(DOCKER_PTF_CAVM) \
|
$(DOCKER_PTF_CAVM) \
|
||||||
$(DOCKER_SYNCD_CAVM_RPC)
|
$(DOCKER_SYNCD_CAVM_RPC)
|
||||||
|
|
||||||
# Inject cavium sai into sairedis
|
# Inject cavium sai into syncd
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI)
|
$(SYNCD)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI)
|
||||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(LIBSAITHRIFT_DEV_CAVM)
|
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV_CAVM)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Runtime dependency on cavium sai is set only for syncd
|
# Runtime dependency on cavium sai is set only for syncd
|
||||||
|
@ -10,10 +10,10 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
|
|||||||
$(DOCKER_PTF_CENTEC) \
|
$(DOCKER_PTF_CENTEC) \
|
||||||
$(DOCKER_SYNCD_CENTEC_RPC)
|
$(DOCKER_SYNCD_CENTEC_RPC)
|
||||||
|
|
||||||
# Inject centec sai into sairedis
|
# Inject centec sai into syncd
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(CENTEC_SAI)
|
$(SYNCD)_DEPENDS += $(CENTEC_SAI)
|
||||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(LIBSAITHRIFT_DEV_CENTEC)
|
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Runtime dependency on centec sai is set only for syncd
|
# Runtime dependency on centec sai is set only for syncd
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
# Centec SAI
|
# Centec SAI
|
||||||
CENTEC_SAI = libsai_1.3.3_amd64.deb
|
CENTEC_SAI = libsai_1.3.3_amd64.deb
|
||||||
$(CENTEC_SAI)_URL = https://github.com/CentecNetworks/goldengate-sai/raw/master/lib/SONiC_1.3.3/libsai_1.3.3-1.0_amd64.deb
|
$(CENTEC_SAI)_URL = https://github.com/CentecNetworks/goldengate-sai/raw/master/lib/SONiC_1.3.3/libsai_1.3.3-1.0_amd64.deb
|
||||||
|
$(CENTEC_SAI)_CONFLICTS += $(LIBSAIVS_DEV)
|
||||||
|
|
||||||
SONIC_ONLINE_DEBS += $(CENTEC_SAI)
|
SONIC_ONLINE_DEBS += $(CENTEC_SAI)
|
||||||
|
@ -10,5 +10,7 @@ $(INVM_LIBSAI)_URL = $(INVM_SAI_ONLINE)/$(INVM_LIBSAI)
|
|||||||
$(INVM_HSAI)_URL = $(INVM_SAI_ONLINE)/$(INVM_HSAI)
|
$(INVM_HSAI)_URL = $(INVM_SAI_ONLINE)/$(INVM_HSAI)
|
||||||
$(INVM_DRV)_URL = $(INVM_SAI_ONLINE)/$(INVM_DRV)
|
$(INVM_DRV)_URL = $(INVM_SAI_ONLINE)/$(INVM_DRV)
|
||||||
|
|
||||||
|
$(INVM_HSAI)_CONFLICTS += $(LIBSAIVS_DEV)
|
||||||
|
|
||||||
SONIC_ONLINE_DEBS += $(INVM_LIBSAI) $(INVM_HSAI) $(INVM_DRV)
|
SONIC_ONLINE_DEBS += $(INVM_LIBSAI) $(INVM_HSAI) $(INVM_DRV)
|
||||||
SONIC_STRETCH_DEBS += $(INVM_DRV)
|
SONIC_STRETCH_DEBS += $(INVM_DRV)
|
||||||
|
@ -12,8 +12,8 @@ SONIC_ALL += $(SONIC_INVM_ONE_IMAGE) \
|
|||||||
$(DOCKER_PTF_INVM) \
|
$(DOCKER_PTF_INVM) \
|
||||||
$(DOCKER_SYNCD_INVM_RPC)
|
$(DOCKER_SYNCD_INVM_RPC)
|
||||||
|
|
||||||
# Inject invm sai into sairedis
|
# Inject invm sai into syncd
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(INVM_HSAI) $(INVM_LIBSAI) $(LIBSAITHRIFT_DEV)
|
$(SYNCD)_DEPENDS += $(INVM_HSAI) $(INVM_LIBSAI) $(LIBSAITHRIFT_DEV_INVM)
|
||||||
|
|
||||||
# Runtime dependency on invm sai is set only for syncd
|
# Runtime dependency on invm sai is set only for syncd
|
||||||
$(SYNCD)_RDEPENDS += $(INVM_HSAI)
|
$(SYNCD)_RDEPENDS += $(INVM_HSAI)
|
||||||
|
@ -8,10 +8,10 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
|
|||||||
$(DOCKER_FPM) \
|
$(DOCKER_FPM) \
|
||||||
$(DOCKER_SYNCD_MRVL_RPC)
|
$(DOCKER_SYNCD_MRVL_RPC)
|
||||||
|
|
||||||
# Inject mrvl sai into sairedis
|
# Inject mrvl sai into syncd
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI)
|
$(SYNCD)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI)
|
||||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(LIBSAITHRIFT_DEV_MRVL)
|
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Runtime dependency on mrvl sai is set only for syncd
|
# Runtime dependency on mrvl sai is set only for syncd
|
||||||
|
@ -3,4 +3,6 @@
|
|||||||
export MRVL_SAI = mrvllibsai_amd64_1.4.1.deb
|
export MRVL_SAI = mrvllibsai_amd64_1.4.1.deb
|
||||||
|
|
||||||
$(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
|
$(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
|
||||||
|
$(MRVL_SAI)_CONFLICTS = $(LIBSAIVS_DEV)
|
||||||
|
|
||||||
SONIC_MAKE_DEBS += $(MRVL_SAI)
|
SONIC_MAKE_DEBS += $(MRVL_SAI)
|
||||||
|
@ -10,4 +10,5 @@ $(MLNX_SAI)_DEPENDS += $(MLNX_SDK_DEBS)
|
|||||||
$(MLNX_SAI)_RDEPENDS += $(MLNX_SDK_RDEBS) $(MLNX_SDK_DEBS)
|
$(MLNX_SAI)_RDEPENDS += $(MLNX_SDK_RDEBS) $(MLNX_SDK_DEBS)
|
||||||
MLNX_SAI_DBGSYM = mlnx-sai-dbgsym_1.mlnx.$(MLNX_SAI_VERSION)_amd64.deb
|
MLNX_SAI_DBGSYM = mlnx-sai-dbgsym_1.mlnx.$(MLNX_SAI_VERSION)_amd64.deb
|
||||||
$(eval $(call add_derived_package,$(MLNX_SAI),$(MLNX_SAI_DBGSYM)))
|
$(eval $(call add_derived_package,$(MLNX_SAI),$(MLNX_SAI_DBGSYM)))
|
||||||
|
$(MLNX_SAI)_CONFLICTS += $(LIBSAIVS_DEV)
|
||||||
SONIC_MAKE_DEBS += $(MLNX_SAI)
|
SONIC_MAKE_DEBS += $(MLNX_SAI)
|
||||||
|
@ -18,10 +18,10 @@ include $(PLATFORM_PATH)/mlnx-ssd-fw-update.mk
|
|||||||
SONIC_ALL += $(SONIC_ONE_IMAGE) \
|
SONIC_ALL += $(SONIC_ONE_IMAGE) \
|
||||||
$(DOCKER_FPM)
|
$(DOCKER_FPM)
|
||||||
|
|
||||||
# Inject mlnx sai into sairedis
|
# Inject mlnx sai into syncd
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI)
|
$(SYNCD)_DEPENDS += $(MLNX_SAI)
|
||||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(LIBSAITHRIFT_DEV)
|
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Runtime dependency on mlnx sai is set only for syncd
|
# Runtime dependency on mlnx sai is set only for syncd
|
||||||
|
@ -22,10 +22,10 @@ SONIC_ONLINE_FILES += $(NPX_DIAG) $(WARM_VERIFIER) $(DSSERVE)
|
|||||||
|
|
||||||
SONIC_ALL += $(SONIC_ONE_IMAGE) $(DOCKER_FPM)
|
SONIC_ALL += $(SONIC_ONE_IMAGE) $(DOCKER_FPM)
|
||||||
|
|
||||||
# Inject nephos sai into sairedis
|
# Inject nephos sai into syncd
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(NEPHOS_SAI)
|
$(SYNCD)_DEPENDS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
|
||||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(LIBSAITHRIFT_DEV)
|
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Runtime dependency on nephos sai is set only for syncd
|
# Runtime dependency on nephos sai is set only for syncd
|
||||||
|
@ -26,3 +26,4 @@ else
|
|||||||
SONIC_ONLINE_DEBS += $(NEPHOS_SAI)
|
SONIC_ONLINE_DEBS += $(NEPHOS_SAI)
|
||||||
endif
|
endif
|
||||||
$(NEPHOS_SAI_DEV)_DEPENDS += $(NEPHOS_SAI)
|
$(NEPHOS_SAI_DEV)_DEPENDS += $(NEPHOS_SAI)
|
||||||
|
$(NEPHOS_SAI_DEV)_CONFLICTS += $(LIBSAIVS_DEV)
|
||||||
|
@ -10,8 +10,8 @@ include $(PLATFORM_PATH)/libsaithrift-dev.mk
|
|||||||
|
|
||||||
SONIC_ALL += $(DOCKER_SONIC_P4)
|
SONIC_ALL += $(DOCKER_SONIC_P4)
|
||||||
|
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(P4_SWITCH)
|
$(SYNCD)_DEPENDS += $(P4_SWITCH)
|
||||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(LIBSAITHRIFT_DEV_P4)
|
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV_P4)
|
||||||
endif
|
endif
|
||||||
$(LIBSAIREDIS)_RDEPENDS += $(P4_SWITCH)
|
$(SYNCD)_RDEPENDS += $(P4_SWITCH)
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
$(LIBSAIREDIS)_DPKG_TARGET = binary-syncd-vs
|
$(LIBSAIREDIS)_DPKG_TARGET = binary-syncd-vs
|
||||||
|
|
||||||
# inject libsaivs and libsaivs_dev to swss build dependency
|
|
||||||
$(SWSS)_DEPENDS += $(LIBSAIVS) $(LIBSAIVS_DEV)
|
|
||||||
|
|
||||||
SYNCD_VS = syncd-vs_1.0.0_amd64.deb
|
SYNCD_VS = syncd-vs_1.0.0_amd64.deb
|
||||||
$(SYNCD_VS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBSAIVS)
|
$(SYNCD_VS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBSAIVS)
|
||||||
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS)))
|
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS)))
|
||||||
|
@ -1,16 +1,10 @@
|
|||||||
# sairedis package
|
# sairedis package
|
||||||
|
|
||||||
LIBSAIREDIS = libsairedis_1.0.0_$(CONFIGURED_ARCH).deb
|
LIBSAIREDIS = libsairedis_1.0.0_$(CONFIGURED_ARCH).deb
|
||||||
|
$(LIBSAIREDIS)_DPKG_TARGET = binary-sairedis
|
||||||
$(LIBSAIREDIS)_SRC_PATH = $(SRC_PATH)/sonic-sairedis
|
$(LIBSAIREDIS)_SRC_PATH = $(SRC_PATH)/sonic-sairedis
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(LIBSWSSCOMMON_DEV)
|
$(LIBSAIREDIS)_DEPENDS += $(LIBSWSSCOMMON_DEV)
|
||||||
$(LIBSAIREDIS)_RDEPENDS += $(LIBSWSSCOMMON)
|
$(LIBSAIREDIS)_RDEPENDS += $(LIBSWSSCOMMON)
|
||||||
ifneq ($(ENABLE_SYNCD_RPC),y)
|
|
||||||
$(LIBSAIREDIS)_DPKG_TARGET = binary-syncd
|
|
||||||
else
|
|
||||||
# Inject libthrift build dependency for RPC build
|
|
||||||
$(LIBSAIREDIS)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV)
|
|
||||||
$(LIBSAIREDIS)_DPKG_TARGET = binary-syncd-rpc
|
|
||||||
endif
|
|
||||||
$(LIBSAIREDIS)_DEB_BUILD_OPTIONS = nocheck
|
$(LIBSAIREDIS)_DEB_BUILD_OPTIONS = nocheck
|
||||||
SONIC_DPKG_DEBS += $(LIBSAIREDIS)
|
SONIC_DPKG_DEBS += $(LIBSAIREDIS)
|
||||||
|
|
||||||
@ -24,17 +18,6 @@ LIBSAIVS_DEV = libsaivs-dev_1.0.0_$(CONFIGURED_ARCH).deb
|
|||||||
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DEV)))
|
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DEV)))
|
||||||
$(LIBSAIVS_DEV)_DEPENDS += $(LIBSAIVS)
|
$(LIBSAIVS_DEV)_DEPENDS += $(LIBSAIVS)
|
||||||
|
|
||||||
ifneq ($(CONFIGURED_PLATFORM),vs)
|
|
||||||
SYNCD = syncd_1.0.0_$(CONFIGURED_ARCH).deb
|
|
||||||
$(SYNCD)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA)
|
|
||||||
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD)))
|
|
||||||
|
|
||||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
|
||||||
SYNCD_RPC = syncd-rpc_1.0.0_$(CONFIGURED_ARCH).deb
|
|
||||||
$(SYNCD_RPC)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA)
|
|
||||||
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_RPC)))
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
LIBSAIMETADATA = libsaimetadata_1.0.0_$(CONFIGURED_ARCH).deb
|
LIBSAIMETADATA = libsaimetadata_1.0.0_$(CONFIGURED_ARCH).deb
|
||||||
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA)))
|
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA)))
|
||||||
@ -53,19 +36,6 @@ $(LIBSAIVS_DBG)_DEPENDS += $(LIBSAIVS)
|
|||||||
$(LIBSAIVS_DBG)_RDEPENDS += $(LIBSAIVS)
|
$(LIBSAIVS_DBG)_RDEPENDS += $(LIBSAIVS)
|
||||||
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DBG)))
|
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DBG)))
|
||||||
|
|
||||||
ifneq ($(CONFIGURED_PLATFORM),vs)
|
|
||||||
SYNCD_DBG = syncd-dbg_1.0.0_$(CONFIGURED_ARCH).deb
|
|
||||||
$(SYNCD_DBG)_DEPENDS += $(SYNCD)
|
|
||||||
$(SYNCD_DBG)_RDEPENDS += $(SYNCD)
|
|
||||||
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_DBG)))
|
|
||||||
|
|
||||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
|
||||||
SYNCD_RPC_DBG = syncd-rpc-dbg_1.0.0_$(CONFIGURED_ARCH).deb
|
|
||||||
$(SYNCD_RPC_DBG)_DEPENDS += $(SYNCD_RPC)
|
|
||||||
$(SYNCD_RPC_DBG)_RDEPENDS += $(SYNCD_RPC)
|
|
||||||
$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_RPC_DBG)))
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
LIBSAIMETADATA_DBG = libsaimetadata-dbg_1.0.0_$(CONFIGURED_ARCH).deb
|
LIBSAIMETADATA_DBG = libsaimetadata-dbg_1.0.0_$(CONFIGURED_ARCH).deb
|
||||||
$(LIBSAIMETADATA_DBG)_DEPENDS += $(LIBSAIMETADATA)
|
$(LIBSAIMETADATA_DBG)_DEPENDS += $(LIBSAIMETADATA)
|
||||||
@ -76,4 +46,3 @@ $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DBG)))
|
|||||||
# are archived into debug one image to facilitate debugging.
|
# are archived into debug one image to facilitate debugging.
|
||||||
#
|
#
|
||||||
DBG_SRC_ARCHIVE += sonic-sairedis
|
DBG_SRC_ARCHIVE += sonic-sairedis
|
||||||
|
|
||||||
|
@ -3,8 +3,10 @@
|
|||||||
SWSS = swss_1.0.0_$(CONFIGURED_ARCH).deb
|
SWSS = swss_1.0.0_$(CONFIGURED_ARCH).deb
|
||||||
$(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss
|
$(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss
|
||||||
$(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \
|
$(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \
|
||||||
$(LIBTEAMDCT) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV)
|
$(LIBTEAMDCT) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV) \
|
||||||
|
$(LIBSAIVS) $(LIBSAIVS_DEV)
|
||||||
$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
|
$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
|
||||||
|
|
||||||
SONIC_DPKG_DEBS += $(SWSS)
|
SONIC_DPKG_DEBS += $(SWSS)
|
||||||
|
|
||||||
SWSS_DBG = swss-dbg_1.0.0_$(CONFIGURED_ARCH).deb
|
SWSS_DBG = swss-dbg_1.0.0_$(CONFIGURED_ARCH).deb
|
||||||
|
36
rules/syncd.mk
Normal file
36
rules/syncd.mk
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
# only used for non-vs platforms
|
||||||
|
|
||||||
|
ifneq ($(CONFIGURED_PLATFORM),vs)
|
||||||
|
|
||||||
|
SYNCD = syncd_1.0.0_amd64.deb
|
||||||
|
$(SYNCD)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA)
|
||||||
|
$(SYNCD)_DPKG_TARGET = binary-syncd
|
||||||
|
$(SYNCD)_SRC_PATH = $(SRC_PATH)/sonic-sairedis
|
||||||
|
$(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBSAIREDIS)
|
||||||
|
$(SYNCD)_RDEPENDS += $(LIBSWSSCOMMON)
|
||||||
|
$(SYNCD)_DEB_BUILD_OPTIONS = nocheck
|
||||||
|
SONIC_DPKG_DEBS += $(SYNCD)
|
||||||
|
|
||||||
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
|
SYNCD_RPC = syncd-rpc_1.0.0_amd64.deb
|
||||||
|
$(SYNCD_RPC)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA)
|
||||||
|
$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC)))
|
||||||
|
|
||||||
|
# Inject libthrift build dependency for RPC build
|
||||||
|
$(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV)
|
||||||
|
$(SYNCD)_DPKG_TARGET = binary-syncd-rpc
|
||||||
|
endif
|
||||||
|
|
||||||
|
SYNCD_DBG = syncd-dbg_1.0.0_amd64.deb
|
||||||
|
$(SYNCD_DBG)_DEPENDS += $(SYNCD)
|
||||||
|
$(SYNCD_DBG)_RDEPENDS += $(SYNCD)
|
||||||
|
$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_DBG)))
|
||||||
|
|
||||||
|
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||||
|
SYNCD_RPC_DBG = syncd-rpc-dbg_1.0.0_amd64.deb
|
||||||
|
$(SYNCD_RPC_DBG)_DEPENDS += $(SYNCD_RPC)
|
||||||
|
$(SYNCD_RPC_DBG)_RDEPENDS += $(SYNCD_RPC)
|
||||||
|
$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC_DBG)))
|
||||||
|
endif
|
||||||
|
|
||||||
|
endif
|
23
slave.mk
23
slave.mk
@ -410,7 +410,7 @@ SONIC_INSTALL_TARGETS = $(addsuffix -install,$(addprefix $(DEBS_PATH)/, \
|
|||||||
$(SONIC_PYTHON_STDEB_DEBS) \
|
$(SONIC_PYTHON_STDEB_DEBS) \
|
||||||
$(SONIC_DERIVED_DEBS) \
|
$(SONIC_DERIVED_DEBS) \
|
||||||
$(SONIC_EXTRA_DEBS)))
|
$(SONIC_EXTRA_DEBS)))
|
||||||
$(SONIC_INSTALL_TARGETS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) $(DEBS_PATH)/$$*
|
$(SONIC_INSTALL_TARGETS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) $(DEBS_PATH)/$$* $$(addsuffix -uninstall,$$(addprefix $(DEBS_PATH)/,$$($$*_CONFLICTS)))
|
||||||
$(HEADER)
|
$(HEADER)
|
||||||
[ -f $(DEBS_PATH)/$* ] || { echo $(DEBS_PATH)/$* does not exist $(LOG) && false $(LOG) }
|
[ -f $(DEBS_PATH)/$* ] || { echo $(DEBS_PATH)/$* does not exist $(LOG) && false $(LOG) }
|
||||||
# put a lock here because dpkg does not allow installing packages in parallel
|
# put a lock here because dpkg does not allow installing packages in parallel
|
||||||
@ -421,6 +421,27 @@ $(SONIC_INSTALL_TARGETS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -inst
|
|||||||
done
|
done
|
||||||
$(FOOTER)
|
$(FOOTER)
|
||||||
|
|
||||||
|
# Targets for installing debian packages prior to build one that depends on them
|
||||||
|
SONIC_UNINSTALL_TARGETS = $(addsuffix -uninstall,$(addprefix $(DEBS_PATH)/, \
|
||||||
|
$(SONIC_ONLINE_DEBS) \
|
||||||
|
$(SONIC_COPY_DEBS) \
|
||||||
|
$(SONIC_MAKE_DEBS) \
|
||||||
|
$(SONIC_DPKG_DEBS) \
|
||||||
|
$(SONIC_PYTHON_STDEB_DEBS) \
|
||||||
|
$(SONIC_DERIVED_DEBS) \
|
||||||
|
$(SONIC_EXTRA_DEBS)))
|
||||||
|
|
||||||
|
$(SONIC_UNINSTALL_TARGETS) : $(DEBS_PATH)/%-uninstall : .platform
|
||||||
|
$(HEADER)
|
||||||
|
[ -f $(DEBS_PATH)/$* ] || { echo $(DEBS_PATH)/$* does not exist $(LOG) && false $(LOG) }
|
||||||
|
# put a lock here because dpkg does not allow installing packages in parallel
|
||||||
|
while true; do
|
||||||
|
if mkdir $(DEBS_PATH)/dpkg_lock &> /dev/null; then
|
||||||
|
{ sudo DEBIAN_FRONTEND=noninteractive dpkg -P $(firstword $(subst _, ,$(basename $*))) $(LOG) && rm -d $(DEBS_PATH)/dpkg_lock && break; } || { rm -d $(DEBS_PATH)/dpkg_lock && exit 1 ; }
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
$(FOOTER)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
## Python packages
|
## Python packages
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit e98a7af95a9767093904d9e8fd320067163d5f87
|
Subproject commit 1e42517996bfe41ac58d4c25ee3f93502befcb9d
|
Loading…
Reference in New Issue
Block a user