change the ot-orchagent name to orchagent-ot

Weitang-Zheng · Jan 16, 2024 · 4a20965 · 4a20965
1 parent 3741d2d
commit 4a20965
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 15 deletions.
diff --git a/Makefile.work b/Makefile.work
@@ -137,7 +137,6 @@ rules/config.user:
 	$(Q)echo -n ""
 
 include rules/config
-
 -include rules/config.user
 
 ifneq ($(DEFAULT_CONTAINER_REGISTRY),)

diff --git a/dockers/docker-ot-orchagent/Dockerfile.j2 → dockers/docker-orchagent-ot/Dockerfile.j2 b/dockers/docker-ot-orchagent/Dockerfile.j2 → dockers/docker-orchagent-ot/Dockerfile.j2
diff --git a/...t-orchagent/base_image_files/swssloglevel → ...rchagent-ot/base_image_files/swssloglevel b/...t-orchagent/base_image_files/swssloglevel → ...rchagent-ot/base_image_files/swssloglevel
diff --git a/dockers/docker-ot-orchagent/buffermgrd.sh → dockers/docker-orchagent-ot/buffermgrd.sh b/dockers/docker-ot-orchagent/buffermgrd.sh → dockers/docker-orchagent-ot/buffermgrd.sh
diff --git a/...docker-ot-orchagent/critical_processes.j2 → ...docker-orchagent-ot/critical_processes.j2 b/...docker-ot-orchagent/critical_processes.j2 → ...docker-orchagent-ot/critical_processes.j2
diff --git a/dockers/docker-ot-orchagent/docker-init.j2 → dockers/docker-orchagent-ot/docker-init.j2 b/dockers/docker-ot-orchagent/docker-init.j2 → dockers/docker-orchagent-ot/docker-init.j2
diff --git a/dockers/docker-ot-orchagent/events_info.json → dockers/docker-orchagent-ot/events_info.json b/dockers/docker-ot-orchagent/events_info.json → dockers/docker-orchagent-ot/events_info.json
diff --git a/dockers/docker-ot-orchagent/orchagent.sh → dockers/docker-orchagent-ot/orchagent.sh b/dockers/docker-ot-orchagent/orchagent.sh → dockers/docker-orchagent-ot/orchagent.sh
diff --git a/...s/docker-ot-orchagent/supervisord.conf.j2 → ...s/docker-orchagent-ot/supervisord.conf.j2 b/...s/docker-ot-orchagent/supervisord.conf.j2 → ...s/docker-orchagent-ot/supervisord.conf.j2
diff --git a/dockers/docker-ot-orchagent/swss_regex.json → dockers/docker-orchagent-ot/swss_regex.json b/dockers/docker-ot-orchagent/swss_regex.json → dockers/docker-orchagent-ot/swss_regex.json
diff --git a/...docker-ot-orchagent/watchdog_processes.j2 → ...docker-orchagent-ot/watchdog_processes.j2 b/...docker-ot-orchagent/watchdog_processes.j2 → ...docker-orchagent-ot/watchdog_processes.j2
diff --git a/dockers/docker-ot-orchagent/Dockerfile.cleanup b/dockers/docker-ot-orchagent/Dockerfile.cleanup
diff --git a/rules/config b/rules/config
@@ -124,6 +124,7 @@ SONIC_DPKG_CACHE_SOURCE ?= /var/cache/sonic/artifacts
 # Default VS build memory preparation
 DEFAULT_VS_PREPARE_MEM = yes
 
+
 # INCLUDE_SYSTEM_TELEMETRY - build docker-sonic-telemetry for system telemetry support
 INCLUDE_SYSTEM_TELEMETRY = y
 

diff --git a/rules/docker-ot-orchagent.dep → rules/docker-orchagent-ot.dep b/rules/docker-ot-orchagent.dep → rules/docker-orchagent-ot.dep
diff --git a/rules/docker-ot-orchagent.mk → rules/docker-orchagent-ot.mk b/rules/docker-ot-orchagent.mk → rules/docker-orchagent-ot.mk
@@ -1,6 +1,6 @@
-# docker image for ot-orchagent
+# docker image for orchagent-ot
 
-DOCKER_OT_ORCHAGENT_STEM = docker-ot-orchagent
+DOCKER_OT_ORCHAGENT_STEM = docker-orchagent-ot
 DOCKER_OT_ORCHAGENT = $(DOCKER_OT_ORCHAGENT_STEM).gz
 DOCKER_OT_ORCHAGENT_DBG = $(DOCKER_OT_ORCHAGENT_STEM)-$(DBG_IMAGE_MARK).gz
 

diff --git a/slave.mk b/slave.mk
@@ -133,8 +133,8 @@ list :
 ###############################################################################
 ## Include other rules
 ###############################################################################
-include $(RULES_PATH)/config
 
+include $(RULES_PATH)/config
 -include $(RULES_PATH)/config.user
 
 

diff --git a/src/sonic-host-services-data/debian/rules b/src/sonic-host-services-data/debian/rules
@@ -6,6 +6,7 @@ else
 	HOST_SERVICE_OPTS := --no-start --no-enable
 endif
 
+
 build:
 
 %:
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ else @@
     	HOST_SERVICE_OPTS := --no-start --no-enable
     endif
     build:
     %:
@@ Expand Down @@