fix(opam): make backtrace public again in xapi-log.backtrace

When using `opam` to install all packages from XAPI some libraries
failed to build because the internal `backtrace` library was only
available in the `xapi-log` package.
The build worked when using `dune` directly (or `koji`), because they
build the entire repository instead of individual packages.

To avoid conflicts with the `xapi-backtrace` installed from `xs-opam`
make the backtrace library properly part of `xapi-log`, by exposing it
as `xapi-log.backtrace`.

Put the cram tests into the xapi-log.backtrace package too.

Add rpclib as a dependency for xapi-log, it was a dependency of
xapi-backtrace.

Fixes: e4da294 ("[maintenance]: use internal backtrace library")

Signed-off-by: Edwin Török <edwin.torok@citrix.com>

Author: edwintorok

dune-project

@@ -235,6 +235,7 @@
   fmt
   logs
   mtime
+  rpclib
   (xapi-stdext-pervasives (= :version))))
 
 (package

ocaml/gencert/dune

@@ -18,7 +18,7 @@
     rresult
     unix
     x509
-    backtrace
+    xapi-log.backtrace
     xapi-consts
     xapi-log
     xapi-inventory

ocaml/idl/dune

@@ -13,7 +13,7 @@
     sexplib0
     sexpr
     threads
-    backtrace
+    xapi-log.backtrace
     xapi-consts
     xapi-schema
     clock

ocaml/libs/backtrace/lib/dune

@@ -1,6 +1,6 @@
 (library
  (name backtrace)
-  (package xapi-log)
+ (public_name xapi-log.backtrace)
   (flags (:standard -w -39-32))
   (libraries
     rpclib.core rpclib.json threads.posix)

ocaml/libs/backtrace/test/dune

@@ -1,13 +1,16 @@
 (library
   (name backtrace_test_lib)
   (modules log)
-  (libraries backtrace)
+  (libraries xapi-log.backtrace)
   )
 
 (executable
   (name raiser)
   (modules raiser)
-  (libraries backtrace_test_lib backtrace)
+  (libraries backtrace_test_lib xapi-log.backtrace)
   )
 
-(cram (deps ./raiser.exe))
+(cram
+  (package xapi-log)
+  (deps ./raiser.exe)
+)

ocaml/libs/http-lib/dune

@@ -34,7 +34,7 @@
   unix
   uuid
   uri
-  backtrace
+  xapi-log.backtrace
   xapi-consts.xapi_version
   xapi-idl.updates
   xapi-log
@@ -60,7 +60,7 @@
   tracing_propagator
   unix
   uri
-  backtrace
+  xapi-log.backtrace
   xapi-log
   xapi-stdext-pervasives
   xapi-stdext-threads
@@ -84,7 +84,7 @@
   stunnel
   threads.posix
   unix
-  backtrace
+  xapi-log.backtrace
   xapi-log
   xapi-stdext-pervasives
   xapi-stdext-unix))

ocaml/libs/log/dune

@@ -13,8 +13,8 @@
    ptime
    ptime.clock
    threads.posix
-   backtrace
    unix
+   xapi-log.backtrace
  )
  (wrapped false)
 )

ocaml/libs/log/test/dune

@@ -1,6 +1,6 @@
 (executable
  (name log_test)
- (libraries log threads.posix backtrace))
+ (libraries log threads.posix xapi-log.backtrace))
 
 (cram
  (package xapi-log)

ocaml/libs/open-uri/dune

@@ -7,7 +7,7 @@
    stunnel
    unix
    uri
-   backtrace
+   xapi-log.backtrace
    xapi-consts
    xapi-log
    xapi-stdext-pervasives

ocaml/quicktest/dune

@@ -30,7 +30,7 @@
     threads.posix
     unix
     uuid
-    backtrace
+    xapi-log.backtrace
     xapi-client
     xapi-consts
     xapi-datamodel