Skip to content

Commit f2fb3a0

Browse files
psafontpsafont
authored
Merge pull request #5782 from psafont/nosystemd
2 parents e11436e + 832fd36 commit f2fb3a0

9 files changed

+128
-170
lines changed

‎dune-project

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,27 @@
225225

226226
(package
227227
(name xapi-networkd)
228+
(authors "Jon Ludlam")
229+
(synopsis "The XCP networking daemon")
230+
(depends
231+
(alcotest :with-test)
232+
astring
233+
base-threads
234+
(forkexec (= :version))
235+
(http-lib (= :version))
236+
mtime
237+
netlink
238+
re
239+
rpclib
240+
(xapi-idl (= :version))
241+
xapi-inventory
242+
(xapi-stdext-pervasives (= :version))
243+
(xapi-stdext-std (= :version))
244+
(xapi-stdext-threads (= :version))
245+
(xapi-stdext-unix (= :version))
246+
xapi-test-utils
247+
(xen-api-client (= :version))
248+
)
228249
)
229250

230251
(package
@@ -241,6 +262,14 @@
241262

242263
(package
243264
(name xapi-forkexecd)
265+
(synopsis "Sub-process control service for xapi")
266+
(description "This daemon creates and manages sub-processes on behalf of xapi.")
267+
(depends
268+
astring
269+
(forkexec (= :version))
270+
(uuid (= :version))
271+
(xapi-stdext-unix (= :version))
272+
)
244273
)
245274

246275
(package
@@ -444,6 +473,19 @@ This package provides an Lwt compatible interface to the library.")
444473

445474
(package
446475
(name forkexec)
476+
(synopsis "Process-spawning library")
477+
(description "Client and server library to spawn processes.")
478+
(depends
479+
base-threads
480+
(fd-send-recv (>= "2.0.0"))
481+
ppx_deriving_rpc
482+
rpclib
483+
(uuid (= :version))
484+
(xapi-log (= :version))
485+
(xapi-stdext-pervasives (= :version))
486+
(xapi-stdext-unix (= :version))
487+
(xapi-tracing (= :version))
488+
)
447489
)
448490

449491
(package
@@ -513,7 +555,6 @@ This package provides an Lwt compatible interface to the library.")
513555
(synopsis "Xapi's standard library extension, Threads")
514556
(authors "Jonathan Ludlam")
515557
(depends
516-
ocaml
517558
base-threads
518559
base-unix
519560
(odoc :with-doc)
@@ -541,7 +582,6 @@ This package provides an Lwt compatible interface to the library.")
541582
(synopsis "Xapi's standard library extension, Zerocheck")
542583
(authors "Jonathan Ludlam")
543584
(depends
544-
ocaml
545585
(odoc :with-doc)
546586
)
547587
)

‎forkexec.opam

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
11
# This file is generated by dune, edit dune-project instead
2-
license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
32
opam-version: "2.0"
4-
maintainer: "xen-api@lists.xen.org"
5-
authors: "xen-api@lists.xen.org"
6-
homepage: "https://github.com/xapi-project/"
3+
synopsis: "Process-spawning library"
4+
description: "Client and server library to spawn processes."
5+
maintainer: ["Xapi project maintainers"]
6+
authors: ["xen-api@lists.xen.org"]
7+
license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
8+
homepage: "https://xapi-project.github.io/"
79
bug-reports: "https://github.com/xapi-project/xen-api/issues"
8-
dev-repo: "git+https://github.com/xapi-project/xen-api.git"
9-
tags: [ "org:xapi-project" ]
10-
11-
build: [[ "dune" "build" "-p" name "-j" jobs ]]
12-
1310
depends: [
14-
"ocaml"
15-
"dune"
11+
"dune" {>= "3.0"}
1612
"base-threads"
17-
"fd-send-recv"
13+
"fd-send-recv" {>= "2.0.0"}
1814
"ppx_deriving_rpc"
1915
"rpclib"
20-
"uuid"
21-
"xapi-log"
22-
"xapi-stdext-pervasives"
23-
"xapi-stdext-unix"
24-
"xapi-tracing"
16+
"uuid" {= version}
17+
"xapi-log" {= version}
18+
"xapi-stdext-pervasives" {= version}
19+
"xapi-stdext-unix" {= version}
20+
"xapi-tracing" {= version}
21+
"odoc" {with-doc}
2522
]
26-
synopsis: "Sub-process control service for xapi"
27-
description:
28-
"This daemon creates and manages sub-processes on behalf of xapi."
29-
url {
30-
src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
31-
}
23+
build: [
24+
["dune" "subst"] {dev}
25+
[
26+
"dune"
27+
"build"
28+
"-p"
29+
name
30+
"-j"
31+
jobs
32+
"@install"
33+
"@runtest" {with-test}
34+
"@doc" {with-doc}
35+
]
36+
]
37+
dev-repo: "git+https://github.com/xapi-project/xen-api.git"

‎forkexec.opam.template

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎xapi-forkexecd.opam

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
# This file is generated by dune, edit dune-project instead
2-
license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
32
opam-version: "2.0"
4-
maintainer: "xen-api@lists.xen.org"
5-
authors: "xen-api@lists.xen.org"
6-
homepage: "https://github.com/xapi-project/"
3+
synopsis: "Sub-process control service for xapi"
4+
description:
5+
"This daemon creates and manages sub-processes on behalf of xapi."
6+
maintainer: ["Xapi project maintainers"]
7+
authors: ["xen-api@lists.xen.org"]
8+
license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
9+
homepage: "https://xapi-project.github.io/"
710
bug-reports: "https://github.com/xapi-project/xen-api/issues"
8-
dev-repo: "git+https://github.com/xapi-project/xen-api.git"
9-
tags: [ "org:xapi-project" ]
10-
11-
build: [
12-
["dune" "build" "-p" name "-j" jobs]
13-
["dune" "runtest" "-p" name "-j" jobs] {with-test}
14-
]
1511
depends: [
16-
"ocaml"
17-
"dune"
12+
"dune" {>= "3.0"}
1813
"astring"
19-
"forkexec"
20-
"systemd" {>= "1.2"}
21-
"uuid"
22-
"xapi-stdext-unix"
14+
"forkexec" {= version}
15+
"uuid" {= version}
16+
"xapi-stdext-unix" {= version}
17+
"odoc" {with-doc}
2318
]
24-
conflicts: [
25-
"fd-send-recv" {< "2.0.0"}
19+
build: [
20+
["dune" "subst"] {dev}
21+
[
22+
"dune"
23+
"build"
24+
"-p"
25+
name
26+
"-j"
27+
jobs
28+
"@install"
29+
"@runtest" {with-test}
30+
"@doc" {with-doc}
31+
]
2632
]
27-
synopsis: "Sub-process control service for xapi"
28-
description:
29-
"This daemon creates and manages sub-processes on behalf of xapi."
30-
url {
31-
src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
32-
}
33+
dev-repo: "git+https://github.com/xapi-project/xen-api.git"

‎xapi-forkexecd.opam.template

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎xapi-networkd.opam

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,44 @@
11
# This file is generated by dune, edit dune-project instead
2-
license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
32
opam-version: "2.0"
4-
maintainer: "xen-api@lists.xen.org"
5-
authors: "jonathan.ludlam@eu.citrix.com"
6-
homepage: "https://github.com/xapi-project/xen-api"
7-
dev-repo: "git+https://github.com/xapi-project/xen-api.git"
3+
synopsis: "The XCP networking daemon"
4+
maintainer: ["Xapi project maintainers"]
5+
authors: ["Jon Ludlam"]
6+
license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
7+
homepage: "https://xapi-project.github.io/"
88
bug-reports: "https://github.com/xapi-project/xen-api/issues"
9-
build: [
10-
["dune" "build" "-p" name "-j" jobs]
11-
["dune" "runtest" "-p" name "-j" jobs] {with-test}
12-
]
139
depends: [
14-
"astring"
10+
"dune" {>= "3.0"}
1511
"alcotest" {with-test}
12+
"astring"
1613
"base-threads"
17-
"forkexec"
18-
"http-lib"
14+
"forkexec" {= version}
15+
"http-lib" {= version}
1916
"mtime"
2017
"netlink"
2118
"re"
2219
"rpclib"
23-
"systemd"
24-
"xapi-idl"
20+
"xapi-idl" {= version}
2521
"xapi-inventory"
26-
"xapi-stdext-pervasives"
27-
"xapi-stdext-std"
28-
"xapi-stdext-threads"
29-
"xapi-stdext-unix"
22+
"xapi-stdext-pervasives" {= version}
23+
"xapi-stdext-std" {= version}
24+
"xapi-stdext-threads" {= version}
25+
"xapi-stdext-unix" {= version}
3026
"xapi-test-utils"
31-
"xen-api-client"
27+
"xen-api-client" {= version}
28+
"odoc" {with-doc}
3229
]
33-
synopsis: "The XCP networking daemon"
34-
url {
35-
src:
36-
"https://github.com/xapi-project/xen-api/archive/master.tar.gz"
37-
}
30+
build: [
31+
["dune" "subst"] {dev}
32+
[
33+
"dune"
34+
"build"
35+
"-p"
36+
name
37+
"-j"
38+
jobs
39+
"@install"
40+
"@runtest" {with-test}
41+
"@doc" {with-doc}
42+
]
43+
]
44+
dev-repo: "git+https://github.com/xapi-project/xen-api.git"

‎xapi-networkd.opam.template

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎xapi-stdext-threads.opam

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ homepage: "https://xapi-project.github.io/"
88
bug-reports: "https://github.com/xapi-project/xen-api/issues"
99
depends: [
1010
"dune" {>= "3.0"}
11-
"ocaml"
1211
"base-threads"
1312
"base-unix"
1413
"odoc" {with-doc}

‎xapi-stdext-zerocheck.opam

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ homepage: "https://xapi-project.github.io/"
88
bug-reports: "https://github.com/xapi-project/xen-api/issues"
99
depends: [
1010
"dune" {>= "3.0"}
11-
"ocaml"
1211
"odoc" {with-doc}
1312
]
1413
build: [

0 commit comments

Comments
 (0)