Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
)
)
52 changes: 29 additions & 23 deletions forkexec.opam
Original file line number Diff line number Diff line change
@@ -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"
29 changes: 0 additions & 29 deletions forkexec.opam.template

This file was deleted.

51 changes: 26 additions & 25 deletions xapi-forkexecd.opam
Original file line number Diff line number Diff line change
@@ -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"
30 changes: 0 additions & 30 deletions xapi-forkexecd.opam.template

This file was deleted.

55 changes: 31 additions & 24 deletions xapi-networkd.opam
Original file line number Diff line number Diff line change
@@ -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"
35 changes: 0 additions & 35 deletions xapi-networkd.opam.template

This file was deleted.

1 change: 0 additions & 1 deletion xapi-stdext-threads.opam
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 0 additions & 1 deletion xapi-stdext-zerocheck.opam
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down