Skip to content

Commit 386fef6

Browse files
jonludlamjonludlam
committed
Remove xenstore modules in favour of ezxenstore
Signed-off-by: Jon Ludlam <[email protected]>
1 parent 5370e8b commit 386fef6

File tree

9 files changed

+43
-510
lines changed

9 files changed

+43
-510
lines changed

‎_oasis‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ Library xenopsd
6565
Storage,
6666
Interface,
6767
Xenctrl_uuid,
68-
Xenstore,
6968
Version
7069
BuildDepends:
7170
threads,
@@ -161,25 +160,10 @@ Executable xenopsd_xc_main
161160
rrd,
162161
sexplib,
163162
xcp-inventory,
163+
ezxenstore,
164164
profiling
165165
CSources: fsync_stubs.c, xenctrlext_stubs.c
166166

167-
Executable watch_test
168-
CompiledObject: best
169-
Path: xc
170-
ByteOpt: -warn-error +a-3
171-
NativeOpt: -warn-error +a-3
172-
MainIs: watch_test.ml
173-
Install: false
174-
BuildDepends:
175-
xenopsd,
176-
xenstore,
177-
xenstore.unix,
178-
xenstore_transport,
179-
xenstore_transport.unix,
180-
threads,
181-
profiling
182-
183167
Executable xenopsd_simulator
184168
CompiledObject: best
185169
Path: simulator
@@ -237,6 +221,7 @@ Executable xenopsd_xenlight_main
237221
xcp.memory,
238222
sexplib,
239223
xcp-inventory,
224+
ezxenstore,
240225
profiling
241226
CSources: fsync_stubs.c, poll_stubs.c
242227

‎_tags‎

Lines changed: 32 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: f77eced2757d5642f0895cf474ea6bf9)
2+
# DO NOT EDIT (digest: d1a8dcabba96dd23f471a86058f7a0cb)
33
# Ignore VCS directories, you can use the same kind of rule outside
44
# OASIS_START/STOP if you want to exclude directories that contains
55
# useless stuff for the build process
@@ -138,6 +138,7 @@ true: annot, bin_annot
138138
"xc/xenctrlext_stubs.c": oasis_executable_xenopsd_xc_main_native
139139
<xc/xenops_xc_main.{native,byte}>: use_libxenopsd_xc_main_stubs
140140
<xc/xenops_xc_main.{native,byte}>: package(cohttp)
141+
<xc/xenops_xc_main.{native,byte}>: package(ezxenstore)
141142
<xc/xenops_xc_main.{native,byte}>: package(fd-send-recv)
142143
<xc/xenops_xc_main.{native,byte}>: package(forkexec)
143144
<xc/xenops_xc_main.{native,byte}>: package(oclock)
@@ -165,12 +166,37 @@ true: annot, bin_annot
165166
<xc/xenops_xc_main.{native,byte}>: package(xmlm)
166167
<xc/xenops_xc_main.{native,byte}>: use_profiling
167168
<xc/xenops_xc_main.{native,byte}>: use_xenopsd
169+
<xc/*.ml{,i,y}>: package(cohttp)
170+
<xc/*.ml{,i,y}>: package(ezxenstore)
171+
<xc/*.ml{,i,y}>: package(fd-send-recv)
172+
<xc/*.ml{,i,y}>: package(forkexec)
173+
<xc/*.ml{,i,y}>: package(oclock)
174+
<xc/*.ml{,i,y}>: package(ppx_deriving_rpc)
175+
<xc/*.ml{,i,y}>: package(ppx_sexp_conv)
176+
<xc/*.ml{,i,y}>: package(rpclib)
168177
<xc/*.ml{,i,y}>: package(rrd)
178+
<xc/*.ml{,i,y}>: package(sexplib)
179+
<xc/*.ml{,i,y}>: package(threads)
180+
<xc/*.ml{,i,y}>: package(threads.posix)
181+
<xc/*.ml{,i,y}>: package(uri)
182+
<xc/*.ml{,i,y}>: package(uuidm)
183+
<xc/*.ml{,i,y}>: package(uutf)
184+
<xc/*.ml{,i,y}>: package(xcp)
169185
<xc/*.ml{,i,y}>: package(xcp-inventory)
170186
<xc/*.ml{,i,y}>: package(xcp.memory)
171187
<xc/*.ml{,i,y}>: package(xcp.rrd)
188+
<xc/*.ml{,i,y}>: package(xcp.storage)
189+
<xc/*.ml{,i,y}>: package(xcp.xen)
172190
<xc/*.ml{,i,y}>: package(xenctrl)
191+
<xc/*.ml{,i,y}>: package(xenstore)
192+
<xc/*.ml{,i,y}>: package(xenstore.unix)
193+
<xc/*.ml{,i,y}>: package(xenstore_transport)
194+
<xc/*.ml{,i,y}>: package(xenstore_transport.unix)
195+
<xc/*.ml{,i,y}>: package(xmlm)
196+
<xc/*.ml{,i,y}>: use_profiling
197+
<xc/*.ml{,i,y}>: use_xenopsd
173198
"xc/fsync_stubs.c": package(cohttp)
199+
"xc/fsync_stubs.c": package(ezxenstore)
174200
"xc/fsync_stubs.c": package(fd-send-recv)
175201
"xc/fsync_stubs.c": package(forkexec)
176202
"xc/fsync_stubs.c": package(oclock)
@@ -199,6 +225,7 @@ true: annot, bin_annot
199225
"xc/fsync_stubs.c": use_profiling
200226
"xc/fsync_stubs.c": use_xenopsd
201227
"xc/xenctrlext_stubs.c": package(cohttp)
228+
"xc/xenctrlext_stubs.c": package(ezxenstore)
202229
"xc/xenctrlext_stubs.c": package(fd-send-recv)
203230
"xc/xenctrlext_stubs.c": package(forkexec)
204231
"xc/xenctrlext_stubs.c": package(oclock)
@@ -227,57 +254,6 @@ true: annot, bin_annot
227254
"xc/xenctrlext_stubs.c": use_profiling
228255
"xc/xenctrlext_stubs.c": use_xenopsd
229256
<xc/xenops_xc_main.{native,byte}>: custom
230-
# Executable watch_test
231-
<xc/watch_test.{native,byte}>: oasis_executable_watch_test_byte
232-
<xc/*.ml{,i,y}>: oasis_executable_watch_test_byte
233-
<xc/watch_test.{native,byte}>: oasis_executable_watch_test_native
234-
<xc/*.ml{,i,y}>: oasis_executable_watch_test_native
235-
<xc/watch_test.{native,byte}>: package(cohttp)
236-
<xc/watch_test.{native,byte}>: package(fd-send-recv)
237-
<xc/watch_test.{native,byte}>: package(forkexec)
238-
<xc/watch_test.{native,byte}>: package(oclock)
239-
<xc/watch_test.{native,byte}>: package(ppx_deriving_rpc)
240-
<xc/watch_test.{native,byte}>: package(ppx_sexp_conv)
241-
<xc/watch_test.{native,byte}>: package(rpclib)
242-
<xc/watch_test.{native,byte}>: package(sexplib)
243-
<xc/watch_test.{native,byte}>: package(threads)
244-
<xc/watch_test.{native,byte}>: package(threads.posix)
245-
<xc/watch_test.{native,byte}>: package(uri)
246-
<xc/watch_test.{native,byte}>: package(uuidm)
247-
<xc/watch_test.{native,byte}>: package(uutf)
248-
<xc/watch_test.{native,byte}>: package(xcp)
249-
<xc/watch_test.{native,byte}>: package(xcp.storage)
250-
<xc/watch_test.{native,byte}>: package(xcp.xen)
251-
<xc/watch_test.{native,byte}>: package(xenstore)
252-
<xc/watch_test.{native,byte}>: package(xenstore.unix)
253-
<xc/watch_test.{native,byte}>: package(xenstore_transport)
254-
<xc/watch_test.{native,byte}>: package(xenstore_transport.unix)
255-
<xc/watch_test.{native,byte}>: package(xmlm)
256-
<xc/watch_test.{native,byte}>: use_profiling
257-
<xc/watch_test.{native,byte}>: use_xenopsd
258-
<xc/*.ml{,i,y}>: package(cohttp)
259-
<xc/*.ml{,i,y}>: package(fd-send-recv)
260-
<xc/*.ml{,i,y}>: package(forkexec)
261-
<xc/*.ml{,i,y}>: package(oclock)
262-
<xc/*.ml{,i,y}>: package(ppx_deriving_rpc)
263-
<xc/*.ml{,i,y}>: package(ppx_sexp_conv)
264-
<xc/*.ml{,i,y}>: package(rpclib)
265-
<xc/*.ml{,i,y}>: package(sexplib)
266-
<xc/*.ml{,i,y}>: package(threads)
267-
<xc/*.ml{,i,y}>: package(threads.posix)
268-
<xc/*.ml{,i,y}>: package(uri)
269-
<xc/*.ml{,i,y}>: package(uuidm)
270-
<xc/*.ml{,i,y}>: package(uutf)
271-
<xc/*.ml{,i,y}>: package(xcp)
272-
<xc/*.ml{,i,y}>: package(xcp.storage)
273-
<xc/*.ml{,i,y}>: package(xcp.xen)
274-
<xc/*.ml{,i,y}>: package(xenstore)
275-
<xc/*.ml{,i,y}>: package(xenstore.unix)
276-
<xc/*.ml{,i,y}>: package(xenstore_transport)
277-
<xc/*.ml{,i,y}>: package(xenstore_transport.unix)
278-
<xc/*.ml{,i,y}>: package(xmlm)
279-
<xc/*.ml{,i,y}>: use_profiling
280-
<xc/*.ml{,i,y}>: use_xenopsd
281257
# Executable xenopsd_simulator
282258
<simulator/xenops_simulator_main.{native,byte}>: oasis_executable_xenopsd_simulator_byte
283259
<simulator/*.ml{,i,y}>: oasis_executable_xenopsd_simulator_byte
@@ -395,6 +371,7 @@ true: annot, bin_annot
395371
"xl/poll_stubs.c": oasis_executable_xenopsd_xenlight_main_native
396372
<xl/xenops_xl_main.{native,byte}>: use_libxenopsd_xenlight_main_stubs
397373
<xl/xenops_xl_main.{native,byte}>: package(cohttp)
374+
<xl/xenops_xl_main.{native,byte}>: package(ezxenstore)
398375
<xl/xenops_xl_main.{native,byte}>: package(fd-send-recv)
399376
<xl/xenops_xl_main.{native,byte}>: package(forkexec)
400377
<xl/xenops_xl_main.{native,byte}>: package(oclock)
@@ -423,6 +400,7 @@ true: annot, bin_annot
423400
<xl/xenops_xl_main.{native,byte}>: use_profiling
424401
<xl/xenops_xl_main.{native,byte}>: use_xenopsd
425402
<xl/*.ml{,i,y}>: package(cohttp)
403+
<xl/*.ml{,i,y}>: package(ezxenstore)
426404
<xl/*.ml{,i,y}>: package(fd-send-recv)
427405
<xl/*.ml{,i,y}>: package(forkexec)
428406
<xl/*.ml{,i,y}>: package(oclock)
@@ -451,6 +429,7 @@ true: annot, bin_annot
451429
<xl/*.ml{,i,y}>: use_profiling
452430
<xl/*.ml{,i,y}>: use_xenopsd
453431
"xl/fsync_stubs.c": package(cohttp)
432+
"xl/fsync_stubs.c": package(ezxenstore)
454433
"xl/fsync_stubs.c": package(fd-send-recv)
455434
"xl/fsync_stubs.c": package(forkexec)
456435
"xl/fsync_stubs.c": package(oclock)
@@ -479,6 +458,7 @@ true: annot, bin_annot
479458
"xl/fsync_stubs.c": use_profiling
480459
"xl/fsync_stubs.c": use_xenopsd
481460
"xl/poll_stubs.c": package(cohttp)
461+
"xl/poll_stubs.c": package(ezxenstore)
482462
"xl/poll_stubs.c": package(fd-send-recv)
483463
"xl/poll_stubs.c": package(forkexec)
484464
"xl/poll_stubs.c": package(oclock)

‎lib/xenopsd.mldylib‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: bf8f8ee381a7a8fe05ca603a15edfaef)
2+
# DO NOT EDIT (digest: f6d3566ed45247192bc4647d7d2db97b)
33
Suspend_image
44
Cancellable_subprocess
55
Bootloader
@@ -21,6 +21,5 @@ Resources
2121
Storage
2222
Interface
2323
Xenctrl_uuid
24-
Xenstore
2524
Version
2625
# OASIS_STOP

‎lib/xenopsd.mllib‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: bf8f8ee381a7a8fe05ca603a15edfaef)
2+
# DO NOT EDIT (digest: f6d3566ed45247192bc4647d7d2db97b)
33
Suspend_image
44
Cancellable_subprocess
55
Bootloader
@@ -21,6 +21,5 @@ Resources
2121
Storage
2222
Interface
2323
Xenctrl_uuid
24-
Xenstore
2524
Version
2625
# OASIS_STOP

‎lib/xenstore.ml‎

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

‎myocamlbuild.ml‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(* OASIS_START *)
2-
(* DO NOT EDIT (digest: c152202698cb0a5145d2381d1af5c780) *)
2+
(* DO NOT EDIT (digest: 94380c710aa3269003607c1e0d8d7cb8) *)
33
module OASISGettext = struct
44
(* # 22 "src/oasis/OASISGettext.ml" *)
55

@@ -1023,28 +1023,6 @@ let package_default =
10231023
"native"
10241024
],
10251025
[(OASISExpr.EBool true, S [A "-warn-error"; A "+a-3"])]);
1026-
(["oasis_executable_watch_test_byte"; "ocaml"; "link"; "byte"],
1027-
[(OASISExpr.EBool true, S [A "-warn-error"; A "+a-3"])]);
1028-
(["oasis_executable_watch_test_native"; "ocaml"; "link"; "native"],
1029-
[(OASISExpr.EBool true, S [A "-warn-error"; A "+a-3"])]);
1030-
(["oasis_executable_watch_test_byte"; "ocaml"; "ocamldep"; "byte"],
1031-
[(OASISExpr.EBool true, S [A "-warn-error"; A "+a-3"])]);
1032-
([
1033-
"oasis_executable_watch_test_native";
1034-
"ocaml";
1035-
"ocamldep";
1036-
"native"
1037-
],
1038-
[(OASISExpr.EBool true, S [A "-warn-error"; A "+a-3"])]);
1039-
(["oasis_executable_watch_test_byte"; "ocaml"; "compile"; "byte"],
1040-
[(OASISExpr.EBool true, S [A "-warn-error"; A "+a-3"])]);
1041-
([
1042-
"oasis_executable_watch_test_native";
1043-
"ocaml";
1044-
"compile";
1045-
"native"
1046-
],
1047-
[(OASISExpr.EBool true, S [A "-warn-error"; A "+a-3"])]);
10481026
([
10491027
"oasis_executable_xenopsd_simulator_byte";
10501028
"ocaml";
@@ -1189,7 +1167,7 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
11891167

11901168
let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
11911169

1192-
# 1193 "myocamlbuild.ml"
1170+
# 1171 "myocamlbuild.ml"
11931171
(* OASIS_STOP *)
11941172
Ocamlbuild_plugin.dispatch
11951173
(fun hook ->

0 commit comments

Comments
 (0)