-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[docker-orchagent]: make build depends only on sairedis package (#6467)
backport c4b5b00 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>
- Loading branch information
Showing
22 changed files
with
102 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule sonic-sairedis
updated
from e98a7a to 1e4251
@tonytitus 201911 does not have this macro. Can you please update same as 201811 and master ?