Revert "Move packages/cmk-agent-ctl --> packages/host/cmk-agent-ctl"

This reverts commit efbb945.

Change-Id: I6e11816b732763bf64e5facd228db86609dd3b69

Cargo.host.lock.bazel

@@ -1,5 +1,5 @@
 {
-  "checksum": "452d51c04bfe9de1ac3653d253936111c41c07cdd7f56feccae89aaad4553af3",
+  "checksum": "8c185a07581562ce071c145586804bd47d84bc0aece97f8ed26729999b0a6ebc",
   "crates": {
     "addr2line 0.24.1": {
       "name": "addr2line",
@@ -25672,7 +25672,7 @@
   },
   "binary_crates": [],
   "workspace_members": {
-    "cmk-agent-ctl 1.0.0": "packages/host/cmk-agent-ctl",
+    "cmk-agent-ctl 1.0.0": "packages/cmk-agent-ctl",
     "mk-sql 0.1.0": "packages/mk-sql"
   },
   "conditions": {

Cargo.host.toml

@@ -5,6 +5,6 @@
 
 [workspace]
 members = [
-    "packages/host/cmk-agent-ctl",
+    "packages/cmk-agent-ctl",
     "packages/mk-sql",
 ]

Makefile

@@ -192,7 +192,7 @@ EXCLUDE_CLEAN=$(EXCLUDE_PROPER) \
 
 # The list of files and folders to be protected from remove after "buildclean" is called
 # Rust dirs are kept due to heavy load when compiled: .cargo, controller
-AGENT_CTL_TARGET_PATH=packages/host/cmk-agent-ctl/target
+AGENT_CTL_TARGET_PATH=packages/cmk-agent-ctl/target
 MK_SQL_TARGET_PATH=packages/mk-sql/target
 EXCLUDE_BUILD_CLEAN=$(EXCLUDE_CLEAN) \
 	    --exclude="doc/plugin-api/build" \

WORKSPACE

@@ -92,7 +92,7 @@ crates_repository(
     lockfile = "//:Cargo.host.lock.bazel",
     manifests = [
         "//:Cargo.host.toml",
-        "//packages/host/cmk-agent-ctl:Cargo.toml",
+        "//packages/cmk-agent-ctl:Cargo.toml",
         "//packages/mk-sql:Cargo.toml",
     ],
 )

agents/Makefile

@@ -22,7 +22,7 @@ DEB_BUILDDIR := $(AGENTS_DIR)/debian/.build
 
 AGENT_CTL := $(AGENTS_DIR)/linux/cmk-agent-ctl
 AGENT_CTL_GZ := $(AGENT_CTL).gz
-AGENT_CTL_DIR := $(REPO_PATH)/packages/host/cmk-agent-ctl
+AGENT_CTL_DIR := $(REPO_PATH)/packages/cmk-agent-ctl
 
 MK_SQL := $(AGENTS_DIR)/linux/mk-sql
 MK_SQL_DIR := $(REPO_PATH)/packages/mk-sql

agents/wnx/agent_keeper/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 clap = { version = "4.3.0", features = ["derive"] }
 lazy_static = "1.4.0"
 windows-service = "0.6.0"
-cmk-agent-ctl = { path = "../../../packages/host/cmk-agent-ctl" }
+cmk-agent-ctl = { path = "../../../packages/cmk-agent-ctl" }
 
 # as in  https://crates.io/crates/windows
 [dependencies.windows-sys]

agents/wnx/parallel.ps1

@@ -19,7 +19,7 @@ if ( "$msbuild_exe" -eq "" ) {
 $sln = (Get-Item -Path ".\").FullName + "\wamain_build.sln"  # 'repo\check_mk\agents\wnx\wamain.sln'
 $makefile = (Get-Item -Path ".\").FullName + "\Makefile" 
 $host_dir = (Get-Item -Path ".\").FullName
-$cmk_agent_ctl_dir = (Get-Item -Path ".\").FullName + "\..\..\packages\host\cmk-agent-ctl"
+$cmk_agent_ctl_dir = (Get-Item -Path ".\").FullName + "\..\..\packages\cmk-agent-ctl"
 # string below is used to quckly switch to the Powershell ISE, do not delete it
 # $sln = 'c:\z\m\check_mk\agents\wnx\wamain.sln'
 

agents/wnx/run.ps1

@@ -505,7 +505,7 @@ function Clear-All() {
     }
 
     Write-Host "Cleaning packages..."
-    Build-Package $true "host/cmk-agent-ctl" "Controller" "--clean"
+    Build-Package $true "cmk-agent-ctl" "Controller" "--clean"
     Build-Package $true "mk-sql" "MK-SQL" "--clean"
 
     Clear-Artifacts
@@ -541,7 +541,7 @@ try {
     Clear-Artifacts
     Clear-All
     Build-Agent
-    Build-Package $argCtl "host/cmk-agent-ctl" "Controller"
+    Build-Package $argCtl "cmk-agent-ctl" "Controller"
     Build-Package $argSql "mk-sql" "MK-SQL"
     Build-Ohm
     Build-Ext

buildscripts/scripts/build-cmk-distro-package.groovy

@@ -130,7 +130,7 @@ def main() {
                     dependency_paths: [
                         "agents/wnx",
                         "agents/windows",
-                        "packages/host/cmk-agent-ctl",
+                        "packages/cmk-agent-ctl",
                         "packages/mk-sql"
                     ],
                     dest: "artifacts/winagt-build",

buildscripts/scripts/stages.yml

@@ -120,7 +120,7 @@ VARIABLES:
       SH: "echo '${CHANGED_FILES_REL}' | grep '^packages/cmk-agent-based/' || true"
 
     - NAME: CHANGED_CMK_AGENT_CTL_FILES
-      SH: "echo '${CHANGED_FILES_REL}' | grep '^packages/host/cmk-agent-ctl/' || true"
+      SH: "echo '${CHANGED_FILES_REL}' | grep '^packages/cmk-agent-ctl/' || true"
 
     - NAME: CHANGED_CMK_AGENT_RECEIVER_FILES
       SH: "echo '${CHANGED_FILES_REL}' | grep '^packages/cmk-agent-receiver/' || true"
@@ -430,8 +430,8 @@ STAGES:
 
     - NAME: "Package cmk-agent-ctl"
       ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_CMK_AGENT_CTL_FILES
-      DIR: "packages/host/cmk-agent-ctl"
-      COMMAND: "../../../scripts/run-in-docker.sh ./run --setup-environment --all &> ${RESULTS}/cmk-agent-ctl.txt"
+      DIR: "packages/cmk-agent-ctl"
+      COMMAND: "../../scripts/run-in-docker.sh ./run --setup-environment --all &> ${RESULTS}/cmk-agent-ctl.txt"
       TEXT_ON_SKIP: "No cmk-agent-ctl files changed"
       RESULT_CHECK_FILE_PATTERN: "results/cmk-agent-ctl.txt"