Skip to content

Commit

Permalink
Added INCLUDE_SYNCD build flag (sonic-net#8)
Browse files Browse the repository at this point in the history
* Added INCLUDE_SSH build flag

Signed-off-by: Maksym Hedeon <maksym@githedgehog.com>

* INCLUDE_SSH fixed non existing path

Signed-off-by: Maksym Hedeon <maksym@githedgehog.com>

* Added INCLUDE_SYNCD build flag

Signed-off-by: Maksym Hedeon <maksym@githedgehog.com>

Signed-off-by: Maksym Hedeon <maksym@githedgehog.com>
Co-authored-by: nazar-garmadiy <nazar@githedgehog.com>
  • Loading branch information
Maksym Hedeon and nazar-garmadiy committed Feb 1, 2023
1 parent 8bf4f5a commit 5d2a121
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions platform/template/docker-gbsyncd-base.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,15 @@ $(DOCKER_GBSYNCD_BASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_D

SONIC_DOCKER_IMAGES += $(DOCKER_GBSYNCD_BASE)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_GBSYNCD_BASE)
ifeq ($(INCLUDE_SYNCD), y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_GBSYNCD_BASE)
endif

SONIC_DOCKER_DBG_IMAGES += $(DOCKER_GBSYNCD_BASE_DBG)
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_GBSYNCD_BASE_DBG)
ifeq ($(INCLUDE_SYNCD), y)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_GBSYNCD_BASE_DBG)
endif

$(DOCKER_GBSYNCD_BASE)_CONTAINER_NAME = gbsyncd
$(DOCKER_GBSYNCD_BASE)_RUN_OPT += --privileged -t
Expand Down
4 changes: 4 additions & 0 deletions platform/template/docker-syncd-base.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,17 @@ endif

SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BASE)
ifneq ($(ENABLE_SYNCD_RPC),y)
ifeq ($(INCLUDE_SYNCD), y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BASE)
endif
endif

SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_BASE_DBG)
ifneq ($(ENABLE_SYNCD_RPC),y)
ifeq ($(INCLUDE_SYNCD), y)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_BASE_DBG)
endif
endif

$(DOCKER_SYNCD_BASE)_CONTAINER_NAME = syncd
$(DOCKER_SYNCD_BASE)_RUN_OPT += --privileged -t
Expand Down
3 changes: 3 additions & 0 deletions rules/config
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,6 @@ INCLUDE_DATABASE = y

# INCLUDE_SSH - build openssh pakage and include files to the fsroot
INCLUDE_SSH = y

# INCLUDE_SYNCD - build docker-syncd-$(PLATFORM)
INCLUDE_SYNCD = y
1 change: 1 addition & 0 deletions slave.mk
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ $(info "INCLUDE_SWSS" : "$(INCLUDE_SWSS)")
$(info "INCLUDE_PMON" : "$(INCLUDE_PMON)")
$(info "INCLUDE_DATABASE" : "$(INCLUDE_DATABASE)")
$(info "INCLUDE_SSH" : "$(INCLUDE_SSH)")
$(info "INCLUDE_SYNCD" : "$(INCLUDE_SYNCD)")
$(info "TELEMETRY_WRITABLE" : "$(TELEMETRY_WRITABLE)")
$(info "ENABLE_AUTO_TECH_SUPPORT" : "$(ENABLE_AUTO_TECH_SUPPORT)")
$(info "PDDF_SUPPORT" : "$(PDDF_SUPPORT)")
Expand Down

0 comments on commit 5d2a121

Please sign in to comment.