Merge pull request #5782 from psafont/nosystemd

dune-project

@@ -225,6 +225,27 @@
 
 (package
   (name xapi-networkd)
+  (authors "Jon Ludlam")
+  (synopsis "The XCP networking daemon")
+  (depends
+    (alcotest :with-test)
+    astring
+    base-threads
+    (forkexec (= :version))
+    (http-lib (= :version))
+    mtime
+    netlink
+    re
+    rpclib
+    (xapi-idl (= :version))
+    xapi-inventory
+    (xapi-stdext-pervasives (= :version))
+    (xapi-stdext-std (= :version))
+    (xapi-stdext-threads (= :version))
+    (xapi-stdext-unix (= :version))
+    xapi-test-utils
+    (xen-api-client (= :version))
+  )
 )
 
 (package
@@ -241,6 +262,14 @@
 
 (package
   (name xapi-forkexecd)
+  (synopsis "Sub-process control service for xapi")
+  (description "This daemon creates and manages sub-processes on behalf of xapi.")
+  (depends
+   astring
+   (forkexec (= :version))
+   (uuid (= :version))
+   (xapi-stdext-unix (= :version))
+  )
 )
 
 (package
@@ -444,6 +473,19 @@ This package provides an Lwt compatible interface to the library.")
 
 (package
   (name forkexec)
+  (synopsis "Process-spawning library")
+  (description "Client and server library to spawn processes.")
+  (depends
+    base-threads
+    (fd-send-recv (>= "2.0.0"))
+    ppx_deriving_rpc
+    rpclib
+    (uuid (= :version))
+    (xapi-log (= :version))
+    (xapi-stdext-pervasives (= :version))
+    (xapi-stdext-unix (= :version))
+    (xapi-tracing (= :version))
+  )
 )
 
 (package
@@ -513,7 +555,6 @@ This package provides an Lwt compatible interface to the library.")
   (synopsis "Xapi's standard library extension, Threads")
   (authors "Jonathan Ludlam")
   (depends
-    ocaml
     base-threads
     base-unix
     (odoc :with-doc)
@@ -541,7 +582,6 @@ This package provides an Lwt compatible interface to the library.")
   (synopsis "Xapi's standard library extension, Zerocheck")
   (authors "Jonathan Ludlam")
   (depends
-    ocaml
     (odoc :with-doc)
   )
 )

forkexec.opam

@@ -1,31 +1,37 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-maintainer: "[email protected]"
-authors: "[email protected]"
-homepage: "https://github.com/xapi-project/"
+synopsis: "Process-spawning library"
+description: "Client and server library to spawn processes."
+maintainer: ["Xapi project maintainers"]
+authors: ["[email protected]"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-tags: [ "org:xapi-project" ]
-
-build: [[ "dune" "build" "-p" name "-j" jobs ]]
-
 depends: [
-  "ocaml"
-  "dune"
+  "dune" {>= "3.0"}
   "base-threads"
-  "fd-send-recv"
+  "fd-send-recv" {>= "2.0.0"}
   "ppx_deriving_rpc"
   "rpclib"
-  "uuid"
-  "xapi-log"
-  "xapi-stdext-pervasives"
-  "xapi-stdext-unix"
-  "xapi-tracing"
+  "uuid" {= version}
+  "xapi-log" {= version}
+  "xapi-stdext-pervasives" {= version}
+  "xapi-stdext-unix" {= version}
+  "xapi-tracing" {= version}
+  "odoc" {with-doc}
 ]
-synopsis: "Sub-process control service for xapi"
-description:
-  "This daemon creates and manages sub-processes on behalf of xapi."
-url {
-  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"

xapi-forkexecd.opam

@@ -1,32 +1,33 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-maintainer: "[email protected]"
-authors: "[email protected]"
-homepage: "https://github.com/xapi-project/"
+synopsis: "Sub-process control service for xapi"
+description:
+  "This daemon creates and manages sub-processes on behalf of xapi."
+maintainer: ["Xapi project maintainers"]
+authors: ["[email protected]"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-tags: [ "org:xapi-project" ]
-
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
 depends: [
-  "ocaml"
-  "dune"
+  "dune" {>= "3.0"}
   "astring"
-  "forkexec"
-  "systemd" {>= "1.2"}
-  "uuid"
-  "xapi-stdext-unix"
+  "forkexec" {= version}
+  "uuid" {= version}
+  "xapi-stdext-unix" {= version}
+  "odoc" {with-doc}
 ]
-conflicts: [
-  "fd-send-recv" {< "2.0.0"}
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
-synopsis: "Sub-process control service for xapi"
-description:
-  "This daemon creates and manages sub-processes on behalf of xapi."
-url {
-  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"

xapi-networkd.opam

@@ -1,37 +1,44 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-maintainer: "[email protected]"
-authors: "[email protected]"
-homepage: "https://github.com/xapi-project/xen-api"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
+synopsis: "The XCP networking daemon"
+maintainer: ["Xapi project maintainers"]
+authors: ["Jon Ludlam"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
 depends: [
-  "astring"
+  "dune" {>= "3.0"}
   "alcotest" {with-test}
+  "astring"
   "base-threads"
-  "forkexec"
-  "http-lib"
+  "forkexec" {= version}
+  "http-lib" {= version}
   "mtime"
   "netlink"
   "re"
   "rpclib"
-  "systemd"
-  "xapi-idl"
+  "xapi-idl" {= version}
   "xapi-inventory"
-  "xapi-stdext-pervasives"
-  "xapi-stdext-std"
-  "xapi-stdext-threads"
-  "xapi-stdext-unix"
+  "xapi-stdext-pervasives" {= version}
+  "xapi-stdext-std" {= version}
+  "xapi-stdext-threads" {= version}
+  "xapi-stdext-unix" {= version}
   "xapi-test-utils"
-  "xen-api-client"
+  "xen-api-client" {= version}
+  "odoc" {with-doc}
 ]
-synopsis: "The XCP networking daemon"
-url {
-  src:
-    "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"

xapi-stdext-threads.opam

@@ -8,7 +8,6 @@ homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
   "dune" {>= "3.0"}
-  "ocaml"
   "base-threads"
   "base-unix"
   "odoc" {with-doc}

xapi-stdext-zerocheck.opam

@@ -8,7 +8,6 @@ homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
   "dune" {>= "3.0"}
-  "ocaml"
   "odoc" {with-doc}
 ]
 build: [