Statistics-- update

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)
 

slave.mk

@@ -1153,7 +1153,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))
@@ -1291,6 +1290,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

src/sonic-eventd/Makefile

@@ -25,7 +25,8 @@ endif
 -include rsyslog_plugin/subdir.mk
 -include rsyslog_plugin_tests/subdir.mk
 
-all: sonic-eventd eventd-tests eventd-tool rsyslog-plugin rsyslog-plugin-tests
+# all: sonic-eventd eventd-tests eventd-tool rsyslog-plugin rsyslog-plugin-tests
+all: sonic-eventd eventd-tests eventd-tool rsyslog-plugin
 
 sonic-eventd: $(OBJS)
 	@echo 'Building target: $@'
@@ -57,7 +58,7 @@ eventd-tests: $(TEST_OBJS)
 	@echo 'Finished running tests'
 	@echo ' '
 
-rsyslog-plugin-tests: $(RSYSLOG-PLUGIN-TEST_OBJS)
+xxrsyslog-plugin-tests: $(RSYSLOG-PLUGIN-TEST_OBJS)
 	@echo 'BUILDING target: $@'
 	@echo 'Invoking G++ Linker'
 	$(CC) $(LDFLAGS) -o $(RSYSLOG-PLUGIN_TEST) $(RSYSLOG-PLUGIN-TEST_OBJS) $(LIBS) $(TEST_LIBS)