From 1290b0f711d3b1f1d1ec6ee9f5984ffcd365bc8c Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Mon, 3 Feb 2025 10:01:28 +0000 Subject: [PATCH 1/2] Add package tgroup This was newly added in xen-api Signed-off-by: Pau Ruiz Safont --- packages/http-lib/http-lib.master/opam | 1 + packages/tgroup/tgroup.master/opam | 31 ++++++++++++++++++++++++++ packages/xapi/xapi.master/opam | 2 ++ tools/sync-xapi-metadata.sh | 1 + 4 files changed, 35 insertions(+) create mode 100644 packages/tgroup/tgroup.master/opam diff --git a/packages/http-lib/http-lib.master/opam b/packages/http-lib/http-lib.master/opam index 8da719e8..aac018e0 100644 --- a/packages/http-lib/http-lib.master/opam +++ b/packages/http-lib/http-lib.master/opam @@ -22,6 +22,7 @@ depends: [ "safe-resources" {= version} "sha" "stunnel" {= version} + "tgroup" "uri" "uuid" {= version} "xapi-backtrace" diff --git a/packages/tgroup/tgroup.master/opam b/packages/tgroup/tgroup.master/opam new file mode 100644 index 00000000..db85502d --- /dev/null +++ b/packages/tgroup/tgroup.master/opam @@ -0,0 +1,31 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +maintainer: ["Xapi project maintainers"] +authors: ["xen-api@lists.xen.org"] +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" +homepage: "https://xapi-project.github.io/" +bug-reports: "https://github.com/xapi-project/xen-api/issues" +depends: [ + "dune" {>= "3.15"} + "xapi-log" + "xapi-stdext-unix" + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/xapi-project/xen-api.git" +url { + src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" +} diff --git a/packages/xapi/xapi.master/opam b/packages/xapi/xapi.master/opam index 54fe02b2..8fc9ba72 100644 --- a/packages/xapi/xapi.master/opam +++ b/packages/xapi/xapi.master/opam @@ -10,6 +10,7 @@ homepage: "https://xapi-project.github.io/" bug-reports: "https://github.com/xapi-project/xen-api/issues" depends: [ "dune" {>= "3.15"} + "ocaml" {>= "4.09"} "alcotest" {with-test} "angstrom" "astring" @@ -63,6 +64,7 @@ depends: [ "tar" "tar-unix" "uri" + "tgroup" "uuid" {= version} "uutf" "uuidm" diff --git a/tools/sync-xapi-metadata.sh b/tools/sync-xapi-metadata.sh index 3f93f26a..95f0f955 100755 --- a/tools/sync-xapi-metadata.sh +++ b/tools/sync-xapi-metadata.sh @@ -23,6 +23,7 @@ rrdd-plugin $XAPI/xen-api safe-resources $XAPI/xen-api sexpr $XAPI/xen-api stunnel $XAPI/xen-api +tgroup $XAPI/xen-api uuid $XAPI/xen-api varstored-guard $XAPI/xen-api vhd-format $XAPI/xen-api From 911db5785832cd010c7d06e1ee41aef30c50b610 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Mon, 3 Feb 2025 10:05:07 +0000 Subject: [PATCH 2/2] Update xen-api's packages' metadata Signed-off-by: Pau Ruiz Safont --- .../vhd-format-lwt/vhd-format-lwt.master/opam | 2 +- packages/vhd-format/vhd-format.master/opam | 7 ++++--- packages/xapi-idl/xapi-idl.master/opam | 1 + .../xapi-storage-script.master/opam | 17 +++++++++-------- packages/xapi-tools/xapi-tools.master/opam | 6 +++--- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/packages/vhd-format-lwt/vhd-format-lwt.master/opam b/packages/vhd-format-lwt/vhd-format-lwt.master/opam index 5287c18a..7cf75e40 100644 --- a/packages/vhd-format-lwt/vhd-format-lwt.master/opam +++ b/packages/vhd-format-lwt/vhd-format-lwt.master/opam @@ -17,7 +17,7 @@ homepage: "https://github.com/mirage/ocaml-vhd" bug-reports: "https://github.com/mirage/ocaml-vhd/issues" depends: [ "dune" {>= "3.15"} - "ocaml" {>= "4.10"} + "ocaml" {>= "4.10.0"} "alcotest" {with-test} "alcotest-lwt" {with-test & >= "1.0.0"} "bigarray-compat" {>= "1.1.0"} diff --git a/packages/vhd-format/vhd-format.master/opam b/packages/vhd-format/vhd-format.master/opam index 7b95114e..d24732c3 100644 --- a/packages/vhd-format/vhd-format.master/opam +++ b/packages/vhd-format/vhd-format.master/opam @@ -3,12 +3,13 @@ opam-version: "2.0" name: "vhd-format" synopsis: "Pure OCaml library to read/write VHD format data" -description: """\ +description: """ A pure OCaml library to read and write [vhd](http://en.wikipedia.org/wiki/VHD_(file_format)) format data, plus a simple command-line tool which allows vhd files to be interrogated, manipulated, format-converted and streamed to and from files and remote -servers.""" +servers. +""" maintainer: "dave@recoil.org" authors: ["Dave Scott" "Jon Ludlam"] license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" @@ -17,7 +18,6 @@ homepage: "https://github.com/mirage/ocaml-vhd" doc: "https://mirage.github.io/ocaml-vhd/" bug-reports: "https://github.com/mirage/ocaml-vhd/issues" depends: [ - "dune" {>= "3.15"} "ocaml" {>= "4.10.0"} "bigarray-compat" {>= "1.1.0"} "cstruct" {>= "6.0.0"} @@ -25,6 +25,7 @@ depends: [ "rresult" {>= "0.3.0"} "uuidm" {>= "0.9.9"} "stdlib-shims" + "dune" {>= "2.8"} "ppx_cstruct" {build & >= "3.0.0"} ] available: os = "linux" | os = "macos" diff --git a/packages/xapi-idl/xapi-idl.master/opam b/packages/xapi-idl/xapi-idl.master/opam index cd394e55..20c9ea0f 100644 --- a/packages/xapi-idl/xapi-idl.master/opam +++ b/packages/xapi-idl/xapi-idl.master/opam @@ -22,6 +22,7 @@ depends: [ "ipaddr" "logs" "lwt" {>= "5.0.0"} + "message-switch-lwt" {with-test} "message-switch-core" "message-switch-unix" "mtime" diff --git a/packages/xapi-storage-script/xapi-storage-script.master/opam b/packages/xapi-storage-script/xapi-storage-script.master/opam index e13c1fd9..0a974584 100644 --- a/packages/xapi-storage-script/xapi-storage-script.master/opam +++ b/packages/xapi-storage-script/xapi-storage-script.master/opam @@ -13,19 +13,20 @@ build: [[ "dune" "build" "-p" name "-j" jobs ]] depends: [ "ocaml" "dune" {>= "3.15"} - "base" "conf-python-3" {with-test} - "xapi-idl" {>= "0.10.0"} - "xapi-storage" + "base" + "inotify" + "lwt" + "message-switch-lwt" "message-switch-unix" - "rpclib" "ppx_deriving_rpc" "ppx_sexp_conv" + "rpclib" + "rpclib-lwt" + "sexplib0" + "xapi-idl" {>= "0.10.0"} "xapi-stdext-date" -] -# python 2.7 is not enough to ensure the availability of 'python' in these -depexts: [ - ["python"] {os-family = "debian" & with-test} + "xapi-storage" ] synopsis: "A directory full of scripts can be a Xapi storage implementation" description: """ diff --git a/packages/xapi-tools/xapi-tools.master/opam b/packages/xapi-tools/xapi-tools.master/opam index 7a117e42..37f44369 100644 --- a/packages/xapi-tools/xapi-tools.master/opam +++ b/packages/xapi-tools/xapi-tools.master/opam @@ -28,15 +28,16 @@ depends: [ "xmlm" "yojson" "rrd-transport" + "xapi-tracing-export" + "xen-api-client" "alcotest" {with-test} "ppx_deriving_rpc" {with-test} "qcheck-core" {with-test} "xapi-test-utils" {with-test} - "xapi-tracing-export" - "xen-api-client" "xenstore_transport" {with-test} "odoc" {with-doc} ] +dev-repo: "git+https://github.com/xapi-project/xen-api.git" build: [ ["./configure"] ["dune" "subst"] {dev} @@ -52,7 +53,6 @@ build: [ "@doc" {with-doc} ] ] -dev-repo: "git+https://github.com/xapi-project/xen-api.git" url { src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" }