CP-51479: [maintenance]: join CLI/daemon packages into xapi-tools

These weren't being installed previously during a spec build, and had to be 'rm'-ed in the Makefile. Join them into a single package instead to reduce the number of opam files. Signed-off-by: Edwin Török <edwin.torok@cloud.com>
AsherBond · Sep 19, 2024 · 2f4d066 · 2f4d066
1 parent 371207d
commit 2f4d066
Show file tree

Hide file tree

Showing 39 changed files with 85 additions and 682 deletions.
diff --git a/Makefile b/Makefile
@@ -156,8 +156,8 @@ install-dune1:
 		message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
 		message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli \
 		xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-tracing-export xapi-expiry-alerts cohttp-posix \
-		xapi-rrd xapi-inventory clock xapi-rrdd rrddump xapi-rrd-transport-utils wsproxy xapi-networkd xapi-squeezed xapi-xenopsd-simulator xapi-xenopsd-cli xapi-xenopsd-xc xapi-sdk\
-		xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck
+		xapi-rrd xapi-inventory clock xapi-sdk\
+		xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-tools
 
 install-dune2:
 	dune install -j $(JOBS) --destdir=$(DESTDIR) --prefix=$(OPTDIR) --libdir=$(LIBDIR) --mandir=$(MANDIR) --libexecdir=$(OPTDIR)/libexec --datadir=$(DOCDIR)  xapi xe
@@ -176,7 +176,7 @@ install:
 	chmod +x $(DESTDIR)$(DOCDIR)/doc-convert.sh
 	# backward compat with existing specfile, to be removed after it is updated
 	find $(DESTDIR) -name '*.cmxs' -delete
-	for pkg in xapi-debug xapi xe xapi-networkd xapi-xenopsd-cli xapi-xenopsd-simulator xapi-xenopsd-xc xapi-squeezed xapi-rrdd xapi-rrd-transport-utils rrddump wsproxy xapi-sdk vhd-tool; do for f in CHANGELOG LICENSE README.markdown; do rm $(DESTDIR)$(OPTDIR)/doc/$$pkg/$$f $(DESTDIR)$(PREFIX)/doc/$$pkg/$$f -f; done; for f in META dune-package opam; do rm $(DESTDIR)$(LIBDIR)/$$pkg/$$f -f; done; done;
+	for pkg in xapi-debug xapi xe xapi-tools xapi-sdk vhd-tool; do for f in CHANGELOG LICENSE README.markdown; do rm $(DESTDIR)$(OPTDIR)/doc/$$pkg/$$f $(DESTDIR)$(PREFIX)/doc/$$pkg/$$f -f; done; for f in META dune-package opam; do rm $(DESTDIR)$(LIBDIR)/$$pkg/$$f -f; done; done;
 
 
 uninstall:
@@ -188,10 +188,10 @@ uninstall:
 		message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
 		message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-log \
 		xapi-open-uri xapi-tracing xapi-tracing-export xapi-expiry-alerts cohttp-posix \
-		xapi-rrd xapi-inventory clock xapi-rrdd rrddump xapi-rrd-transport-utils wsproxy xapi-networkd xapi-squeezed xapi-xenopsd-simulator xapi-xenopsd-cli\
-		xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck
+		xapi-rrd xapi-inventory clock xapi-sdk\
+		xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-tools
 	dune uninstall --destdir=$(DESTDIR) --prefix=$(OPTDIR) --libdir=$(LIBDIR) --mandir=$(MANDIR)  xapi xe
-	dune uninstall --destdir=$(DESTDIR) --prefix=$(PREFIX) --libdir=$(LIBDIR) --mandir=$(MANDIR) --libexecdir=$(XENOPSD_LIBEXECDIR)  xapi-xenopsd-xc
+	dune uninstall --destdir=$(DESTDIR) --prefix=$(PREFIX) --libdir=$(LIBDIR) --mandir=$(MANDIR) --libexecdir=$(XENOPSD_LIBEXECDIR)  xapi-tools
 	dune uninstall --destdir=$(DESTDIR) --prefix=$(OPTDIR) --libdir=$(LIBDIR) --mandir=$(MANDIR) --libexecdir=$(OPTDIR)/libexec --bindir=$(OPTDIR)/debug --datadir=$(OPTDIR)/debug xapi-debug
 
 compile_flags.txt: Makefile

diff --git a/dune-project b/dune-project
@@ -89,18 +89,6 @@
   (name xe)
 )
 
-(package
-  (name xapi-xenopsd-xc)
-)
-
-(package
-  (name xapi-xenopsd-simulator)
-)
-
-(package
-  (name xapi-xenopsd-cli)
-)
-
 (package
   (name xapi-types)
 )
@@ -158,10 +146,6 @@
   (name xapi-storage)
 )
 
-(package
-  (name xapi-squeezed)
-)
-
 (package
   (name xapi-schema)
 )
@@ -186,90 +170,10 @@
   )
 )
 
-(package
-  (name xapi-rrdd)
-  (synopsis "Performance monitoring daemon for xapi")
-  (description "This daemon monitors 'datasources' i.e. time-varying values such as performance counters and records the samples in RRD archives. These archives can be used to examine historical performance trends.")
-  (depends
-   (ocaml (>= "4.02.0"))
-   (alcotest :with-test)
-   astring
-   cmdliner
-   (fmt :with-test)
-   (gzip (= :version))
-   (http-lib (= :version))
-   inotify
-   io-page
-   ipaddr
-   mtime
-   polly
-   ppx_deriving_rpc
-   rpclib
-   uri
-   (ezxenstore (= :version))
-   (uuid (= :version))
-   xapi-backtrace
-   (xapi-idl (= :version))
-   (xapi-rrd (= :version))
-   (xapi-stdext-threads (= :version))
-   (xapi-stdext-unix (= :version))
-   xapi-tracing
-   xenctrl
-   xenstore
-   xenstore_transport
-   xmlm
-   yojson
-  )
-)
-
-(package
-  (name xapi-rrd-transport-utils)
-  (synopsis "Shared-memory protocols for exposing performance counters")
-  (description "VMs running on a Xen host can use this library to expose performance counters which can be sampled by the xapi performance monitoring daemon.")
-  (authors "John Else")
-  (depends
-   ocaml
-   cmdliner
-   (rrd-transport (= :version))
-   (xapi-idl (= :version))
-   (xapi-rrd (= :version))
-  )
-)
-
 (package
   (name xapi-open-uri)
 )
 
-(package
-  (name xapi-networkd)
-  (authors "Jon Ludlam")
-  (synopsis "The XCP networking daemon")
-  (depends
-    (alcotest :with-test)
-    astring
-    base-threads
-    (forkexec (= :version))
-    (http-lib (= :version))
-    integers
-    mtime
-    netlink
-    re
-    result
-    rresult
-    rpclib
-    uri
-    (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))
-    yojson
-  )
-)
-
 (package
   (name xapi-nbd)
 )
@@ -373,6 +277,37 @@
   )
 )
 
+(package
+  (name xapi-tools)
+  (synopsis "Various daemons and CLI applications required by XAPI")
+  (description "Includes message-switch, xenopsd, forkexecd, ...")
+  (depends
+    astring
+    base64
+    cmdliner
+    cstruct-unix
+    fmt
+    logs
+    lwt
+    mtime
+    netlink
+    qmp
+    re
+    result
+    rpclib
+    rresult
+    uri
+    xenctrl
+    xmlm
+    yojson
+    (alcotest :with-test)
+    (ppx_deriving_rpc :with-test)
+    (qcheck-core :with-test)
+    (xapi-test-utils :with-test)
+    (xenstore_transport :with-test)
+  )
+)
+
 (package
   (name xapi)
   (synopsis "The toolstack daemon which implements the XenAPI")
@@ -462,23 +397,6 @@
   )
 )
 
-(package
-  (name wsproxy)
-  (synopsis "Websockets proxy for VNC traffic")
-  (authors "Jon Ludlam" "Marcello Seri")
-  (license "LGPL-2.0-only WITH OCaml-LGPL-linking-exception")
-  (depends
-    (alcotest :with-test)
-    (base64 (>= "3.1.0"))
-    fmt
-    logs
-    (lwt (>= "3.0.0"))
-    re
-    uuid
-    (qcheck-core :with-test)
-  )
-)
-
 (package
   (name vhd-tool)
   (synopsis "Manipulate .vhd files")
@@ -573,10 +491,6 @@ This package provides an Lwt compatible interface to the library.")
   (name safe-resources)
 )
 
-(package
-  (name rrddump)
-)
-
 (package
   (name rrd-transport)
   (synopsis "Shared-memory protocols for exposing system metrics")

diff --git a/ocaml/networkd/bin/dune b/ocaml/networkd/bin/dune
@@ -45,13 +45,13 @@
 )
 
 (install
- (package xapi-networkd)
+ (package xapi-tools)
  (section man)
  (files xcp-networkd.1)
 )
 
 (install
- (package xapi-networkd)
+ (package xapi-tools)
  (section sbin)
  (files (networkd.exe as xcp-networkd))
 )

diff --git a/ocaml/networkd/bin_db/dune b/ocaml/networkd/bin_db/dune
@@ -1,7 +1,7 @@
 (executable
  (name networkd_db)
  (public_name networkd_db)
- (package xapi-networkd)
+ (package xapi-tools)
  (modes exe)
  (libraries
 

diff --git a/ocaml/networkd/test/dune b/ocaml/networkd/test/dune
@@ -15,7 +15,7 @@
 
 (rule
  (alias runtest)
- (package xapi-networkd)
+ (package xapi-tools)
  (deps
   (:x network_test.exe)
   (source_tree jsonrpc_files)

diff --git a/ocaml/squeezed/src/dune b/ocaml/squeezed/src/dune
@@ -30,7 +30,7 @@
 )
 
 (install
- (package xapi-squeezed)
+ (package xapi-tools)
  (section sbin)
  (files (squeezed.exe as squeezed))
 )
diff --git a/ocaml/squeezed/test/dune b/ocaml/squeezed/test/dune
@@ -1,6 +1,6 @@
 (test
  (name squeeze_test_main)
- (package xapi-squeezed)
+ (package xapi-tools)
   (flags (:standard -bin-annot))
   (libraries
     alcotest

diff --git a/ocaml/tests/dune b/ocaml/tests/dune
@@ -186,7 +186,7 @@
 (rule
   (deps ../xenopsd/xc/xenops_xc_main.exe)
   (target xenops_xc_main.disasm)
-  (package xapi-xenopsd-xc)
+  (package xapi-tools)
   (action
     (with-stdout-to %{target}
       (run objdump %{deps} --wide -d --no-show-raw-insn)
@@ -202,7 +202,7 @@
 )
 (rule
   (alias runtest)
-  (package xapi-xenopsd-xc)
+  (package xapi-tools)
   (deps (:script ./unix_select.gawk) (:disasm xenops_xc_main.disasm))
   (action (run gawk -f ./%{script} %{disasm}))
 )

diff --git a/ocaml/wsproxy/cli/dune b/ocaml/wsproxy/cli/dune
@@ -5,7 +5,7 @@
 (executable
   (name wsproxy)
   (public_name wsproxy)
-  (package wsproxy)
+  (package xapi-tools)
   (libraries
    fmt
    logs

diff --git a/ocaml/wsproxy/test/dune b/ocaml/wsproxy/test/dune
@@ -1,6 +1,6 @@
 (test
   (name wsproxy_tests)
   (modes exe)
-  (package wsproxy)
+  (package xapi-tools)
   (libraries alcotest qcheck-core wslib)
 )
diff --git a/ocaml/xapi-idl/rrd/dune b/ocaml/xapi-idl/rrd/dune
@@ -44,7 +44,7 @@
 (executable
  (name rrd_cli)
  (public_name rrd-cli)
- (package xapi-rrdd)
+ (package xapi-tools)
  (modules rrd_cli)
  (modes exe)
  (libraries
@@ -60,6 +60,6 @@
 (rule
  (alias runtest)
  (deps (:x rrd_cli.exe))
- (package xapi-rrdd)
+ (package xapi-tools)
  (action (run %{x} --help=plain)))
 
diff --git a/ocaml/xcp-rrdd/bin/rrdd/dune b/ocaml/xcp-rrdd/bin/rrdd/dune
@@ -74,7 +74,7 @@
 )
 
 (install
-  (package xapi-rrdd)
+  (package xapi-tools)
   (files (xcp_rrdd.exe as xcp-rrdd))
   (section sbin)
 )
diff --git a/ocaml/xcp-rrdd/bin/rrddump/dune b/ocaml/xcp-rrdd/bin/rrddump/dune
@@ -9,6 +9,6 @@
     xapi-rrd.unix
     xmlm
   )
-  (package rrddump)
+  (package xapi-tools)
 )
 
diff --git a/ocaml/xcp-rrdd/bin/transport-rw/dune b/ocaml/xcp-rrdd/bin/transport-rw/dune
@@ -2,7 +2,7 @@
   (modes exe)
   (names reader writer)
   (public_names rrdreader rrdwriter)
-  (package xapi-rrd-transport-utils)
+  (package xapi-tools)
   (libraries
     cmdliner
 

diff --git a/ocaml/xcp-rrdd/test/rrdd/dune b/ocaml/xcp-rrdd/test/rrdd/dune
@@ -1,7 +1,7 @@
 (test
   (name test_rrdd_monitor)
   (modes exe)
-  (package xapi-rrdd)
+  (package xapi-tools)
   (libraries
     alcotest
 

diff --git a/ocaml/xenopsd/cli/dune b/ocaml/xenopsd/cli/dune
@@ -29,7 +29,7 @@
 (install
   (files (main.exe as xenops-cli))
   (section sbin)
-  (package xapi-xenopsd-cli)
+  (package xapi-tools)
 )
 
 (rule
@@ -49,5 +49,5 @@
 (install
  (section man)
  (files xenops-cli.1.gz)
- (package xapi-xenopsd-cli)
+ (package xapi-tools)
 )
diff --git a/ocaml/xenopsd/dbgring/dune b/ocaml/xenopsd/dbgring/dune
@@ -1,7 +1,7 @@
 (executable
  (name dbgring)
 ; (public_name dbgring)
-; (package xapi-xenopsd-xc)
+; (package xapi-tools)
  (libraries
 
    xapi_xenopsd

diff --git a/ocaml/xenopsd/list_domains/dune b/ocaml/xenopsd/list_domains/dune
@@ -1,6 +1,6 @@
 (executable
   (name list_domains)
   (public_name list_domains)
-  (package xapi-xenopsd-xc)
+  (package xapi-tools)
   (libraries  xenctrl xapi-idl.memory ezxenstore.watch uuid)
 )