Fix opam build due to backtrace library merge (xapi-project#6977)

Fixes a build failure caused by
xapi-project#6957.
The build worked with `dune` and with `koji`, but not when using `opam`
to install all packages.

Author: edwintorok

dune-project

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

ocaml/database/dune

@@ -53,7 +53,6 @@
   httpsvr
   unix
   uuid
-  backtrace
   xapi-datamodel
   xapi-log
   (re_export xapi-schema)

ocaml/database/parse_db_conf.ml

@@ -173,8 +173,9 @@ let parse_db_conf s =
     sanity_check !connections ;
     !connections
   with exn ->
+    let bt = Printexc.get_raw_backtrace () in
     error "Database config parse failed: %s" (Printexc.to_string exn) ;
-    Backtrace.reraise exn Cannot_parse_database_config_file
+    Printexc.raise_with_backtrace Cannot_parse_database_config_file bt
 
 let get_db_conf path =
   if Sys.file_exists path then

ocaml/forkexecd/lib/dune

@@ -12,7 +12,6 @@
    rpclib.xml
    unix
    uuid
-   backtrace
    xapi-log
    xapi-stdext-pervasives
    xapi-stdext-unix

ocaml/forkexecd/lib/fe_systemctl.ml

@@ -158,7 +158,7 @@ let start_transient ?env ?properties ?(exec_ty = Type.Simple) ~service cmd args
   ) ;
   try start_transient ?env ?properties ~exec_ty ~service cmd args
   with e ->
-    Backtrace.is_important e ;
+    let bt = Printexc.get_raw_backtrace () in
     (* If start failed we do not know what state the service is in:
      * try to stop it and clean up.
      * Stopping could fail as well, in which case report the original exception.
@@ -168,4 +168,4 @@ let start_transient ?env ?properties ?(exec_ty = Type.Simple) ~service cmd args
         ()
       with _ -> ()
     ) ;
-    raise e
+    Printexc.raise_with_backtrace e bt

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))