From cfe51a7dfef755fd6bc87b359298347ab3dc01d9 Mon Sep 17 00:00:00 2001 From: Maksym Hedeon Date: Fri, 16 Dec 2022 19:43:56 +0200 Subject: [PATCH] Added INCLUDE_SYNCD build flag (#8) * Added INCLUDE_SSH build flag Signed-off-by: Maksym Hedeon * INCLUDE_SSH fixed non existing path Signed-off-by: Maksym Hedeon * Added INCLUDE_SYNCD build flag Signed-off-by: Maksym Hedeon Signed-off-by: Maksym Hedeon Co-authored-by: nazar-garmadiy --- platform/template/docker-gbsyncd-base.mk | 4 ++++ platform/template/docker-syncd-base.mk | 4 ++++ rules/config | 3 +++ slave.mk | 1 + 4 files changed, 12 insertions(+) diff --git a/platform/template/docker-gbsyncd-base.mk b/platform/template/docker-gbsyncd-base.mk index 0b02557845f9..42426b274fe7 100644 --- a/platform/template/docker-gbsyncd-base.mk +++ b/platform/template/docker-gbsyncd-base.mk @@ -17,11 +17,15 @@ $(DOCKER_GBSYNCD_BASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG SONIC_DOCKER_IMAGES += $(DOCKER_GBSYNCD_BASE) SONIC_BUSTER_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_BUSTER_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 diff --git a/platform/template/docker-syncd-base.mk b/platform/template/docker-syncd-base.mk index a6a027f94aac..738b5275e275 100644 --- a/platform/template/docker-syncd-base.mk +++ b/platform/template/docker-syncd-base.mk @@ -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 diff --git a/rules/config b/rules/config index 4e3db7ebcc97..749ba4293fdc 100644 --- a/rules/config +++ b/rules/config @@ -261,3 +261,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 diff --git a/slave.mk b/slave.mk index 1d71e961bc34..a602580ec9ae 100644 --- a/slave.mk +++ b/slave.mk @@ -335,6 +335,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)")