tools: rename and category content into debug tools and services

1. Rename folder name with "_"
2. Category acrn_crashlog, acrn_log, acrn_trace into debug_tools folder and acrn_bridge, life_mngr, acrn_manager into services.

Tracked-On: #5644
Signed-off-by: Xie, nanlin <nanlin.xie@intel.com>

misc/Makefile

@@ -10,30 +10,30 @@ all: acrn-manager acrnbridge life_mngr
 endif
 
 acrn-crashlog:
-	$(MAKE) -C $(T)/tools/acrn-crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
+	$(MAKE) -C $(T)/debug_tools/acrn_crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
 
 acrnlog:
-	$(MAKE) -C $(T)/tools/acrnlog OUT_DIR=$(OUT_DIR)
+	$(MAKE) -C $(T)/debug_tools/acrn_log OUT_DIR=$(OUT_DIR)
 
 acrn-manager:
-	$(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
+	$(MAKE) -C $(T)/services/acrn_manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
 
 acrntrace:
-	$(MAKE) -C $(T)/tools/acrntrace OUT_DIR=$(OUT_DIR)
+	$(MAKE) -C $(T)/debug_tools/acrn_trace OUT_DIR=$(OUT_DIR)
 
 acrnbridge:
-	$(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR)
+	$(MAKE) -C $(T)/services/acrn_bridge OUT_DIR=$(OUT_DIR)
 
 life_mngr:
-	$(MAKE) -C $(T)/life_mngr OUT_DIR=$(OUT_DIR)
+	$(MAKE) -C $(T)/services/life_mngr OUT_DIR=$(OUT_DIR)
 
 .PHONY: clean
 clean:
-	$(MAKE) -C $(T)/tools/acrn-crashlog OUT_DIR=$(OUT_DIR) clean
-	$(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) clean
-	$(MAKE) -C $(T)/tools/acrntrace OUT_DIR=$(OUT_DIR) clean
-	$(MAKE) -C $(T)/tools/acrnlog OUT_DIR=$(OUT_DIR) clean
-	$(MAKE) -C $(T)/life_mngr OUT_DIR=$(OUT_DIR) clean
+	$(MAKE) -C $(T)/debug_tools/acrn_crashlog OUT_DIR=$(OUT_DIR) clean
+	$(MAKE) -C $(T)/services/acrn_manager OUT_DIR=$(OUT_DIR) clean
+	$(MAKE) -C $(T)/debug_tools/acrn_trace OUT_DIR=$(OUT_DIR) clean
+	$(MAKE) -C $(T)/debug_tools/acrn_log OUT_DIR=$(OUT_DIR) clean
+	$(MAKE) -C $(T)/services/life_mngr OUT_DIR=$(OUT_DIR) clean
 	rm -rf $(OUT_DIR)
 
 .PHONY: install
@@ -45,19 +45,19 @@ install: acrn-manager-install acrnbridge-install acrn-life-mngr-install
 endif
 
 acrn-crashlog-install:
-	$(MAKE) -C $(T)/tools/acrn-crashlog OUT_DIR=$(OUT_DIR) install
+	$(MAKE) -C $(T)/debug_tools/acrn_crashlog OUT_DIR=$(OUT_DIR) install
 
 acrnlog-install:
-	$(MAKE) -C $(T)/tools/acrnlog OUT_DIR=$(OUT_DIR) install
+	$(MAKE) -C $(T)/debug_tools/acrn_log OUT_DIR=$(OUT_DIR) install
 
 acrn-manager-install:
-	$(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) install
+	$(MAKE) -C $(T)/services/acrn_manager OUT_DIR=$(OUT_DIR) install
 
 acrntrace-install:
-	$(MAKE) -C $(T)/tools/acrntrace OUT_DIR=$(OUT_DIR) install
+	$(MAKE) -C $(T)/debug_tools/acrn_trace OUT_DIR=$(OUT_DIR) install
 
 acrnbridge-install:
-	$(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) install
+	$(MAKE) -C $(T)/services/acrn_bridge OUT_DIR=$(OUT_DIR) install
 
 acrn-life-mngr-install:
-	$(MAKE) -C $(T)/life_mngr OUT_DIR=$(OUT_DIR) install
+	$(MAKE) -C $(T)/services/life_mngr OUT_DIR=$(OUT_DIR) install

misc/services/acrn_bridge/Makefile

@@ -1,4 +1,4 @@
-include ../../paths.make
+include ../../../paths.make
 
 OUT_DIR ?= .
 

misc/services/acrn_manager/Makefile

@@ -1,4 +1,4 @@
-include ../../paths.make
+include ../../../paths.make
 
 T := $(CURDIR)
 OUT_DIR ?= $(shell mkdir -p $(T)/build;cd $(T)/build;pwd)
@@ -20,17 +20,17 @@ MANAGER_CFLAGS += -Wno-format-truncation -Wno-unused-result
 MANAGER_CFLAGS += -Wno-stringop-truncation
 MANAGER_CFLAGS += $(CFLAGS)
 
-MANAGER_CFLAGS += -I../../devicemodel/include
-MANAGER_CFLAGS += -I../../devicemodel/include/public
-MANAGER_CFLAGS += -I../../hypervisor/include
+MANAGER_CFLAGS += -I../../../devicemodel/include
+MANAGER_CFLAGS += -I../../../devicemodel/include/public
+MANAGER_CFLAGS += -I../../../hypervisor/include
 
-MANAGER_HEADERS := ../../devicemodel/include/dm.h
-MANAGER_HEADERS += ../../devicemodel/include/types.h
-MANAGER_HEADERS += ../../devicemodel/include/vmm.h
-MANAGER_HEADERS += ../../devicemodel/include/dm_string.h
-MANAGER_HEADERS += ../../devicemodel/include/macros.h
-MANAGER_HEADERS += ../../devicemodel/include/public/vhm_ioctl_defs.h
-MANAGER_HEADERS += ../../devicemodel/include/public/acrn_common.h
+MANAGER_HEADERS := ../../../devicemodel/include/dm.h
+MANAGER_HEADERS += ../../../devicemodel/include/types.h
+MANAGER_HEADERS += ../../../devicemodel/include/vmm.h
+MANAGER_HEADERS += ../../../devicemodel/include/dm_string.h
+MANAGER_HEADERS += ../../../devicemodel/include/macros.h
+MANAGER_HEADERS += ../../../devicemodel/include/public/vhm_ioctl_defs.h
+MANAGER_HEADERS += ../../../devicemodel/include/public/acrn_common.h
 
 GCC_MAJOR=$(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1)
 GCC_MINOR=$(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1)