stats & options update

sonic-net · Aug 17, 2022 · 5605b20 · 5605b20
1 parent e8cc328
commit 5605b20
Show file tree

Hide file tree

Showing 12 changed files with 1,114 additions and 85 deletions.
diff --git a/rules/docker-eventd.mk b/rules/docker-eventd.mk
@@ -43,4 +43,5 @@ $(DOCKER_EVENTD)_PLUGIN = rsyslog_plugin
 $($(DOCKER_EVENTD)_PLUGIN)_PATH = $($(DOCKER_EVENTD)_FILESPATH)
 
 SONIC_COPY_FILES += $($(DOCKER_EVENTD)_PLUGIN)
+$(DOCKER_EVENTD)_SHARED_FILES = $($(DOCKER_EVENTD)_PLUGIN)
 
diff --git a/slave.mk b/slave.mk
@@ -1154,7 +1154,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MODELS_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CTRMGRD)) \
         $(addprefix $(FILES_PATH)/,$($(SONIC_CTRMGRD)_FILES)) \
-        $(addprefix $(FILES_PATH)/,$($(DOCKER_EVENTD)_PLUGIN)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MGMT_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SYSTEM_HEALTH)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_HOST_SERVICES_PY3))
@@ -1293,6 +1292,8 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 		$(if $($(docker:-dbg.gz=.gz)_MACHINE),\
 			mv $($(docker:-dbg.gz=.gz)_CONTAINER_NAME).sh $($(docker:-dbg.gz=.gz)_MACHINE)_$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).sh
 		)
+		$(foreach file, $($(docker)_SHARED_FILES), \
+			{ cp $($(file)_PATH)/$(file) $(FILES_PATH)/ $(LOG) || exit 1 ; } ; )
 	)
 
 	# Exported variables are used by sonic_debian_extension.sh
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,4 +43,5 @@ $(DOCKER_EVENTD)_PLUGIN = rsyslog_plugin
		$($(DOCKER_EVENTD)_PLUGIN)_PATH = $($(DOCKER_EVENTD)_FILESPATH)

		SONIC_COPY_FILES += $($(DOCKER_EVENTD)_PLUGIN)
		$(DOCKER_EVENTD)_SHARED_FILES = $($(DOCKER_EVENTD)_PLUGIN)