[docker-orchagent]: make build depends only on sairedis package

platform/barefoot/bfn-sai.mk

@@ -3,3 +3,4 @@ $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel
 
 SONIC_ONLINE_DEBS += $(BFN_SAI) # $(BFN_SAI_DEV)
 $(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)
+$(BFN_SAI_DEV)_CONFLICTS += $(LIBSAIVS_DEV)

platform/barefoot/rules.mk

@@ -20,8 +20,13 @@ include $(PLATFORM_PATH)/bfn-modules.mk
 SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \
              $(DOCKER_FPM)
 
-# Inject sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(BFN_SAI) $(WNC_OSW1800_PLATFORM) $(BFN_INGRASYS_PLATFORM) $(BFN_PLATFORM)  #$(LIBSAITHRIFT_DEV_BFN)
+# Inject sai into syncd
+#$(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
 $(SYNCD)_RDEPENDS += $(BFN_SAI) $(WNC_OSW1800_PLATFORM) $(BFN_INGRASYS_PLATFORM) $(BFN_PLATFORM)

platform/broadcom/rules.mk

@@ -31,8 +31,11 @@ SONIC_ONLINE_FILES += $(BCMCMD) $(DSSERVE)
 SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT_IMAGE) \
              $(DOCKER_FPM)
 
-# Inject brcm sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV) $(LIBSAITHRIFT_DEV)
+# Inject brcm sai into syncd
+$(SYNCD)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)
+ifeq ($(ENABLE_SYNCD_RPC),y)
+$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
+endif
 
 # Runtime dependency on brcm sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(BRCM_SAI)

platform/broadcom/sai.mk

@@ -7,3 +7,4 @@ $(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsa
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
+$(BRCM_SAI_DEV)_CONFLICTS += $(LIBSAIVS_DEV)

platform/cavium/rules.mk

@@ -14,8 +14,11 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_PTF_CAVM) \
              $(DOCKER_SYNCD_CAVM_RPC)
 
-# Inject cavium sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI) $(LIBSAITHRIFT_DEV_CAVM)
+# Inject cavium sai into syncd
+$(SYNCD)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI)
+ifeq ($(ENABLE_SYNCD_RPC),y)
+$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV_CAVM)
+endif
 
 # Runtime dependency on cavium sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(CAVM_SAI)

platform/centec/rules.mk

@@ -12,8 +12,11 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_PTF_CENTEC) \
              $(DOCKER_SYNCD_CENTEC_RPC)
 
-# Inject centec sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(CENTEC_SAI) $(LIBSAITHRIFT_DEV_CENTEC)
+# Inject centec sai into syncd
+$(SYNCD)_DEPENDS += $(CENTEC_SAI)
+ifeq ($(ENABLE_SYNCD_RPC),y)
+$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
+endif
 
 # Runtime dependency on centec sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(CENTEC_SAI)

platform/centec/sdk.mk

@@ -1,5 +1,6 @@
 # Centec SAI
 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)_CONFLICTS += $(LIBSAIVS_DEV)
 
 SONIC_ONLINE_DEBS += $(CENTEC_SAI)

platform/innovium/invm-sai.mk

@@ -10,5 +10,7 @@ $(INVM_LIBSAI)_URL = $(INVM_SAI_ONLINE)/$(INVM_LIBSAI)
 $(INVM_HSAI)_URL   =  $(INVM_SAI_ONLINE)/$(INVM_HSAI)
 $(INVM_DRV)_URL    =  $(INVM_SAI_ONLINE)/$(INVM_DRV)
 
+$(INVM_HSAI)_CONFLICTS += $(LIBSAIVS_DEV)
+
 SONIC_ONLINE_DEBS  += $(INVM_LIBSAI) $(INVM_HSAI) $(INVM_DRV)
 SONIC_STRETCH_DEBS += $(INVM_DRV)

platform/innovium/rules.mk

@@ -14,8 +14,8 @@ SONIC_ALL += $(SONIC_INVM_ONE_IMAGE) \
              $(DOCKER_PTF_INVM) \
              $(DOCKER_SYNCD_INVM_RPC)
 
-# Inject invm sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(INVM_HSAI) $(INVM_LIBSAI) $(LIBSAITHRIFT_DEV_INVM)
+# Inject invm sai into syncd
+$(SYNCD)_DEPENDS += $(INVM_HSAI) $(INVM_LIBSAI) $(LIBSAITHRIFT_DEV_INVM)
 
 # Runtime dependency on invm sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(INVM_HSAI)

platform/marvell/rules.mk

@@ -11,8 +11,11 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM) \
              $(DOCKER_SYNCD_MRVL_RPC)
 
-# Inject mrvl sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI) $(LIBSAITHRIFT_DEV_MRVL)
+# Inject mrvl sai into syncd
+$(SYNCD)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI)
+ifeq ($(ENABLE_SYNCD_RPC),y)
+$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
+endif
 
 # Runtime dependency on mrvl sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(MRVL_SAI)

platform/marvell/sai.mk

@@ -6,4 +6,6 @@ export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
 $(MRVL_SAI)_DEPENDS += $(MRVL_FPA)
+$(MRVL_SAI)_CONFLICTS = $(LIBSAIVS_DEV)
+
 SONIC_MAKE_DEBS += $(MRVL_SAI)

platform/mellanox/mlnx-sai.mk

@@ -9,4 +9,5 @@ MLNX_SAI = mlnx-sai_1.mlnx.$(MLNX_SAI_VERSION)_amd64.deb
 $(MLNX_SAI)_SRC_PATH = $(PLATFORM_PATH)/mlnx-sai
 $(MLNX_SAI)_DEPENDS += $(MLNX_SDK_DEBS)
 $(MLNX_SAI)_RDEPENDS += $(MLNX_SDK_RDEBS) $(MLNX_SDK_DEBS)
+$(MLNX_SAI)_CONFLICTS += $(LIBSAIVS_DEV)
 SONIC_MAKE_DEBS += $(MLNX_SAI)

platform/mellanox/rules.mk

@@ -21,8 +21,11 @@ include $(PLATFORM_PATH)/mlnx-ssd-fw-update.mk
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM)
 
-# Inject mlnx sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI) $(LIBSAITHRIFT_DEV)
+# Inject mlnx sai into syncd
+$(SYNCD)_DEPENDS += $(MLNX_SAI)
+ifeq ($(ENABLE_SYNCD_RPC),y)
+$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
+endif
 
 # Runtime dependency on mlnx sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(MLNX_SAI)

platform/nephos/rules.mk

@@ -20,8 +20,11 @@ SONIC_ONLINE_FILES += $(NPX_DIAG) $(DSSERVE)
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) $(DOCKER_FPM)
 
-# Inject nephos sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV) $(LIBSAITHRIFT_DEV)
+# Inject nephos sai into syncd
+$(SYNCD)_DEPENDS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
+ifeq ($(ENABLE_SYNCD_RPC),y)
+$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)
+endif
 
 # Runtime dependency on nephos sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(NEPHOS_SAI)

platform/nephos/sai.mk

@@ -1,6 +1,7 @@
 SDK_VERSION = 3.0.0
 SAI_VERSION = 1.4.1
 SAI_COMMIT_ID = 4780e5
+
 NEPHOS_SAI = libsainps_$(SDK_VERSION)_sai_$(SAI_VERSION)_$(SAI_COMMIT_ID)_amd64.deb
 $(NEPHOS_SAI)_URL = "https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_$(SDK_VERSION)_sai_$(SAI_VERSION)_$(SAI_COMMIT_ID)_amd64.deb"
 
@@ -10,3 +11,4 @@ $(NEPHOS_SAI_DEV)_URL = "https://github.com/NephosInc/SONiC/raw/master/sai/libsa
 
 SONIC_ONLINE_DEBS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
 $(NEPHOS_SAI_DEV)_DEPENDS += $(NEPHOS_SAI)
+$(NEPHOS_SAI_DEV)_CONFLICTS += $(LIBSAIVS_DEV)

platform/p4/rules.mk

@@ -10,5 +10,8 @@ include $(PLATFORM_PATH)/libsaithrift-dev.mk
 
 SONIC_ALL += $(DOCKER_SONIC_P4)
 
-$(LIBSAIREDIS)_DEPENDS += $(P4_SWITCH) $(LIBSAITHRIFT_DEV_P4)
-$(LIBSAIREDIS)_RDEPENDS += $(P4_SWITCH)
+$(SYNCD)_DEPENDS += $(P4_SWITCH)
+ifeq ($(ENABLE_SYNCD_RPC),y)
+$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV_P4)
+endif
+$(SYNCD)_RDEPENDS += $(P4_SWITCH)

platform/vs/syncd-vs.mk

@@ -1,8 +1,5 @@
 $(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)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBSAIVS)
 $(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS)))

rules/sairedis.mk

@@ -1,8 +1,9 @@
 # sairedis package
 
 LIBSAIREDIS = libsairedis_1.0.0_amd64.deb
+$(LIBSAIREDIS)_DPKG_TARGET = binary-sairedis
 $(LIBSAIREDIS)_SRC_PATH = $(SRC_PATH)/sonic-sairedis
-$(LIBSAIREDIS)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV)
+$(LIBSAIREDIS)_DEPENDS += $(LIBSWSSCOMMON_DEV)
 $(LIBSAIREDIS)_RDEPENDS += $(LIBSWSSCOMMON)
 $(LIBSAIREDIS)_DEB_BUILD_OPTIONS = nocheck
 SONIC_DPKG_DEBS += $(LIBSAIREDIS)
@@ -16,16 +17,6 @@ $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS)))
 LIBSAIVS_DEV = libsaivs-dev_1.0.0_amd64.deb
 $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DEV)))
 
-ifneq ($(CONFIGURED_PLATFORM),vs)
-SYNCD = syncd_1.0.0_amd64.deb
-$(SYNCD)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA)
-$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD)))
-
-SYNCD_RPC = syncd-rpc_1.0.0_amd64.deb
-$(SYNCD_RPC)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA)
-$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_RPC)))
-endif
-
 LIBSAIMETADATA = libsaimetadata_1.0.0_amd64.deb
 $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA)))
 
@@ -43,18 +34,6 @@ $(LIBSAIVS_DBG)_DEPENDS += $(LIBSAIVS)
 $(LIBSAIVS_DBG)_RDEPENDS += $(LIBSAIVS)
 $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS_DBG)))
 
-ifneq ($(CONFIGURED_PLATFORM),vs)
-SYNCD_DBG = syncd-dbg_1.0.0_amd64.deb
-$(SYNCD_DBG)_DEPENDS += $(SYNCD)
-$(SYNCD_DBG)_RDEPENDS += $(SYNCD)
-$(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_DBG)))
-
-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,$(LIBSAIREDIS),$(SYNCD_RPC_DBG)))
-endif
-
 LIBSAIMETADATA_DBG = libsaimetadata-dbg_1.0.0_amd64.deb
 $(LIBSAIMETADATA_DBG)_DEPENDS += $(LIBSAIMETADATA)
 $(LIBSAIMETADATA_DBG)_RDEPENDS += $(LIBSAIMETADATA)
@@ -65,4 +44,3 @@ $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIMETADATA_DBG)))
 # are archived into debug one image to facilitate debugging.
 #
 DBG_SRC_ARCHIVE += sonic-sairedis
-

rules/swss.mk

@@ -3,8 +3,10 @@
 SWSS = swss_1.0.0_amd64.deb
 $(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss
 $(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)
+
 SONIC_DPKG_DEBS += $(SWSS)
 
 SWSS_DBG = swss-dbg_1.0.0_amd64.deb

rules/syncd.mk

@@ -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

slave.mk

@@ -375,7 +375,7 @@ SONIC_INSTALL_TARGETS = $(addsuffix -install,$(addprefix $(DEBS_PATH)/, \
 			$(SONIC_PYTHON_STDEB_DEBS) \
 			$(SONIC_DERIVED_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)
 	[ -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
@@ -386,6 +386,27 @@ $(SONIC_INSTALL_TARGETS) : $(DEBS_PATH)/%-install : .platform $$(addsuffix -inst
 	done
 	$(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
 ###############################################################################