Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

syncd-rpc.mk: Fix stretch dockers build failure #2812

Merged
merged 20 commits into from
Apr 24, 2019
Merged

syncd-rpc.mk: Fix stretch dockers build failure #2812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
941eb7d
Updated Makefile infrastructure to build debug images.
renukamanavalan Apr 5, 2019
042d51e
Dropped the regular binary using DBG_PACKAGES and a small name change…
renukamanavalan Apr 6, 2019
24f38f2
Tweaked the changes to retain the existing behavior w.r.t INSTALL_DEB…
renukamanavalan Apr 8, 2019
4443c70
1) slave.mk - Dropped unused Docker build args
renukamanavalan Apr 11, 2019
7b84e64
Reverted some changes, per review comments.
renukamanavalan Apr 11, 2019
c717e50
Merge remote-tracking branch 'upstream/master'
renukamanavalan Apr 12, 2019
60a001c
Get in sync with the new update that filters out dockers to be built …
renukamanavalan Apr 12, 2019
cefc4b8
Merge remote-tracking branch 'upstream/master'
renukamanavalan Apr 15, 2019
f659917
Mkae a template for each target that can be shared by all platforms.
renukamanavalan Apr 15, 2019
9d7aedb
A small change, that can fit better with other targets too.
renukamanavalan Apr 15, 2019
279084f
Extended debug to all stretch based docker images
renukamanavalan Apr 16, 2019
99783dd
Merge remote-tracking branch 'upstream/master'
renukamanavalan Apr 18, 2019
a2297a3
1) Combined all orchagent makefiles into one platform independent mak…
renukamanavalan Apr 18, 2019
b4b30fd
Changes per review comments:
renukamanavalan Apr 18, 2019
575e43d
Merge remote-tracking branch 'upstream/master'
renukamanavalan Apr 18, 2019
e504eb7
1) Corrected a copy/paste mistake
renukamanavalan Apr 18, 2019
0db6c0f
Fixed a copy/paste bug
renukamanavalan Apr 19, 2019
755dcee
Merge remote-tracking branch 'upstream/master'
renukamanavalan Apr 22, 2019
6f1c92b
The base syncd dockers follow a template, which defines the base dock…
renukamanavalan Apr 22, 2019
3d74bcc
Fixed spelling mistake
renukamanavalan Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/barefoot/docker-syncd-bfn-rpc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $(DOCKER_SYNCD_BFN_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
$(LIBSAIMETADATA_DBG) \
$(LIBSAIREDIS_DBG)
endif
$(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BFN)
$(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
renukamanavalan marked this conversation as resolved.
Show resolved Hide resolved
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN_RPC)
ifeq ($(ENABLE_SYNCD_RPC),y)
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/docker-saiserver-mlnx.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ $(DOCKER_SAISERVER_MLNX)_CONTAINER_NAME = saiserver
$(DOCKER_SAISERVER_MLNX)_RUN_OPT += --net=host --privileged -t
$(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
$(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_SYNCD_MLNX)_RUN_OPT += --tmpfs /run/criu
$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /run/criu
2 changes: 1 addition & 1 deletion platform/mellanox/docker-syncd-mlnx-rpc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $(DOCKER_SYNCD_MLNX_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
endif

$(DOCKER_SYNCD_MLNX_RPC)_PYTHON_DEBS += $(MLNX_SFPD)
$(DOCKER_SYNCD_MLNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_MLNX)
$(DOCKER_SYNCD_MLNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MLNX_RPC)
ifeq ($(ENABLE_SYNCD_RPC),y)
Expand Down