From c94207ea3a638f9bcfe3d558e702da215843a86e Mon Sep 17 00:00:00 2001
From: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Date: Thu, 20 Mar 2025 11:16:52 +0000
Subject: [PATCH 1/2] forkexecd: do not tie vfork_helper to the forkexec
 package

This makes the binary unusable for testing in xapi_forkexecd

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
---
 ocaml/forkexecd/dune | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ocaml/forkexecd/dune b/ocaml/forkexecd/dune
index 40d4a7eb7c6..01b51f24ed5 100644
--- a/ocaml/forkexecd/dune
+++ b/ocaml/forkexecd/dune
@@ -3,7 +3,6 @@
 (rule
   (deps (source_tree helper))
   (targets vfork_helper)
-  (package forkexec)
   (action
     (no-infer
       (progn

From cecdcbab5797f50acbb656fb2ab5a3a13dccf678 Mon Sep 17 00:00:00 2001
From: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Date: Thu, 20 Mar 2025 11:46:52 +0000
Subject: [PATCH 2/2] opam: add missing dependencies to packages

This makes them compilable in xs-opam

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
---
 dune-project             | 7 +++++--
 xapi-debug.opam          | 1 +
 xapi-stdext-threads.opam | 6 ++++--
 xapi-tools.opam          | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dune-project b/dune-project
index af6364148da..2d8cab13744 100644
--- a/dune-project
+++ b/dune-project
@@ -264,6 +264,7 @@
     re
     result
     rpclib
+    rrdd-plugin
     rresult
     sexplib
     sexplib0
@@ -315,6 +316,7 @@
     ; 'xapi-tools' will have version ~dev, not 'master' like all the others
     ; because it is not in xs-opam yet
     rrd-transport
+    rrdd-plugin
     xapi-tracing-export
     xen-api-client
     (alcotest :with-test)
@@ -721,10 +723,11 @@ This package provides an Lwt compatible interface to the library.")
     base-threads
     base-unix
     (alcotest :with-test)
+    (clock (= :version))
     (fmt :with-test)
-    (odoc :with-doc)
+    mtime
+    (xapi-log (= :version))
     (xapi-stdext-pervasives (= :version))
-    (mtime :with-test)
     (xapi-stdext-unix (= :version))
   )
 )
diff --git a/xapi-debug.opam b/xapi-debug.opam
index f8550f7508b..a2b7d9dd863 100644
--- a/xapi-debug.opam
+++ b/xapi-debug.opam
@@ -42,6 +42,7 @@ depends: [
   "re"
   "result"
   "rpclib"
+  "rrdd-plugin"
   "rresult"
   "sexplib"
   "sexplib0"
diff --git a/xapi-stdext-threads.opam b/xapi-stdext-threads.opam
index ae64e906b29..a61529e7e09 100644
--- a/xapi-stdext-threads.opam
+++ b/xapi-stdext-threads.opam
@@ -11,11 +11,13 @@ depends: [
   "base-threads"
   "base-unix"
   "alcotest" {with-test}
+  "clock" {= version}
   "fmt" {with-test}
-  "odoc" {with-doc}
+  "mtime"
+  "xapi-log" {= version}
   "xapi-stdext-pervasives" {= version}
-  "mtime" {with-test}
   "xapi-stdext-unix" {= version}
+  "odoc" {with-doc}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/xapi-tools.opam b/xapi-tools.opam
index 852102302dd..da2e2ce2967 100644
--- a/xapi-tools.opam
+++ b/xapi-tools.opam
@@ -28,6 +28,7 @@ depends: [
   "xmlm"
   "yojson"
   "rrd-transport"
+  "rrdd-plugin"
   "xapi-tracing-export"
   "xen-api-client"
   "alcotest" {with-test}