From 40bbc67440e2be89ce434f43e29d45f32aa3bd71 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Wed, 14 Sep 2022 16:43:54 +0100 Subject: [PATCH 1/2] [new release] nbd, nbd-unix and nbd-tool (6.0.0) CHANGES: * Use Stdlib's Result type * BREAKING: Avoid unerasable optional arguments in init_tls_get_ctx * Update for cmdliner 1.1.0 compatibility * Update for cstruct 6.1.0 compatibility * ci: fix doc upload and coverage reporting --- packages/nbd-tool/nbd-tool.6.0.0/opam | 45 ++++++++++++++++++++++++ packages/nbd-unix/nbd-unix.6.0.0/opam | 44 ++++++++++++++++++++++++ packages/nbd/nbd.6.0.0/opam | 49 +++++++++++++++++++++++++++ 3 files changed, 138 insertions(+) create mode 100644 packages/nbd-tool/nbd-tool.6.0.0/opam create mode 100644 packages/nbd-unix/nbd-unix.6.0.0/opam create mode 100644 packages/nbd/nbd.6.0.0/opam diff --git a/packages/nbd-tool/nbd-tool.6.0.0/opam b/packages/nbd-tool/nbd-tool.6.0.0/opam new file mode 100644 index 000000000000..6eb591ed70d4 --- /dev/null +++ b/packages/nbd-tool/nbd-tool.6.0.0/opam @@ -0,0 +1,45 @@ +opam-version: "2.0" +synopsis: "Network Block Device (NBD) protocol implementation" +description: """ +This library allows applications to export and consume block +devices using the NBD protocol (as used by Linux, qemu etc)""" +maintainer: "Xapi project maintainers" +authors: ["Jonathan Ludlam" "David Scott" "Thomas Sanders"] +license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" +tags: ["org:mirage" "org:xapi-project"] +homepage: "https://github.com/xapi-project/nbd" +bug-reports: "https://github.com/xapi-project/nbd/issues" +depends: [ + "ocaml" {>= "4.08.0"} + "dune" {>= "2.7.0"} + "alcotest" {with-test} + "alcotest-lwt" {with-test} + "cmdliner" {>= "1.1.0"} + "lwt" {>= "2.7.0"} + "lwt_log" + "mirage-block" {< "3.0.0"} + "mirage-block-unix" + "nbd-unix" {=version} + "odoc" {with-doc} + "uri" +] +depexts: [ + ["qemu-img" "nbd" "nmap-ncat"] {with-test & os-family = "rhel"} + ["qemu-utils" "nbd-client" "netcat-openbsd"] {with-test & os-family = "debian"} +] +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "build" "-p" name "-j" jobs "@doc"] {with-doc} + ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test} +] +dev-repo: "git+https://github.com/xapi-project/nbd.git" +url { + src: + "https://github.com/xapi-project/nbd/releases/download/6.0.0/nbd-6.0.0.tbz" + checksum: [ + "sha256=8a0fb5f6f8a37422e09afbb28bb3158e714b43b23b6845225217ea619b72c4de" + "sha512=d3517bcda9261715c5d92d3966e694844f89ea93a7e9b622ed8e6e71046ae0fd7383926c17fb73af5de53b83474d7b2ade21baf662a3cb2d49b324ad122aec83" + ] +} +x-commit-hash: "41f9e670e0e1beb8714215b813b5b4d184fdcdc5" diff --git a/packages/nbd-unix/nbd-unix.6.0.0/opam b/packages/nbd-unix/nbd-unix.6.0.0/opam new file mode 100644 index 000000000000..5d31fca959ad --- /dev/null +++ b/packages/nbd-unix/nbd-unix.6.0.0/opam @@ -0,0 +1,44 @@ +opam-version: "2.0" +synopsis: "Network Block Device (NBD) protocol implementation" +description: """ +This library allows applications to export and consume block +devices using the NBD protocol (as used by Linux, qemu etc)""" +maintainer: "Xapi project maintainers" +authors: ["Jonathan Ludlam" "David Scott" "Thomas Sanders"] +license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" +tags: ["org:mirage" "org:xapi-project"] +homepage: "https://github.com/xapi-project/nbd" +doc: "https://xapi-project.github.io/nbd/nbd-unix/index.html" +bug-reports: "https://github.com/xapi-project/nbd/issues" +depends: [ + "ocaml" {>= "4.08.0"} + "bisect_ppx" {dev & >= "2.5.0"} + "dune" {>= "2.7.0"} + "cstruct-lwt" + "io-page" + "io-page-unix" + "lwt" {>= "2.7.0"} + "lwt_ssl" + "mirage-block" {>= "2.0.0"} + "mirage-block-unix" + "nbd" {=version} + "odoc" {with-doc} + "ssl" + "alcotest-lwt" {with-test} +] +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "build" "-p" name "-j" jobs "@doc"] {with-doc} + ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test} +] +dev-repo: "git+https://github.com/xapi-project/nbd.git" +url { + src: + "https://github.com/xapi-project/nbd/releases/download/6.0.0/nbd-6.0.0.tbz" + checksum: [ + "sha256=8a0fb5f6f8a37422e09afbb28bb3158e714b43b23b6845225217ea619b72c4de" + "sha512=d3517bcda9261715c5d92d3966e694844f89ea93a7e9b622ed8e6e71046ae0fd7383926c17fb73af5de53b83474d7b2ade21baf662a3cb2d49b324ad122aec83" + ] +} +x-commit-hash: "41f9e670e0e1beb8714215b813b5b4d184fdcdc5" diff --git a/packages/nbd/nbd.6.0.0/opam b/packages/nbd/nbd.6.0.0/opam new file mode 100644 index 000000000000..ed4df25e712b --- /dev/null +++ b/packages/nbd/nbd.6.0.0/opam @@ -0,0 +1,49 @@ +opam-version: "2.0" +maintainer: "Xapi project maintainers" +authors: [ "Jonathan Ludlam" "David Scott" "Thomas Sanders" ] +license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" +homepage: "https://github.com/xapi-project/nbd" +doc: "https://xapi-project.github.io/nbd/nbd/index.html" +dev-repo: "git+https://github.com/xapi-project/nbd.git" +bug-reports: "https://github.com/xapi-project/nbd/issues" +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "build" "-p" name "-j" jobs "@doc"] {with-doc} + ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test} +] +depends: [ + "ocaml" {>= "4.08.0"} + "bisect_ppx" {dev & >= "2.5.0"} + "dune" {>= "2.7.0"} + "alcotest" {with-test} + "alcotest-lwt" {with-test} + "cstruct" {>= "6.0.0"} + "io-page" + "io-page-unix" {with-test} + "mirage-block" {>= "2.0.0"} + "mirage-block-unix" + "lwt" {>= "2.7.0"} + "lwt_log" + "odoc" {with-doc} + "ppx_cstruct" {>= "3.1.0"} + "ppx_sexp_conv" {>= "v0.9.0"} + "rresult" + "sexplib" + "uri" +] +conflicts: ["result" {< "1.5"}] +tags: [ "org:mirage" "org:xapi-project" ] +synopsis: "Network Block Device (NBD) protocol implementation" +description: """ +This library allows applications to export and consume block +devices using the NBD protocol (as used by Linux, qemu etc)""" +url { + src: + "https://github.com/xapi-project/nbd/releases/download/6.0.0/nbd-6.0.0.tbz" + checksum: [ + "sha256=8a0fb5f6f8a37422e09afbb28bb3158e714b43b23b6845225217ea619b72c4de" + "sha512=d3517bcda9261715c5d92d3966e694844f89ea93a7e9b622ed8e6e71046ae0fd7383926c17fb73af5de53b83474d7b2ade21baf662a3cb2d49b324ad122aec83" + ] +} +x-commit-hash: "41f9e670e0e1beb8714215b813b5b4d184fdcdc5" From 6b7e732177f79475da4a10df3c6e05607f6541e3 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 16 Sep 2022 09:23:05 +0100 Subject: [PATCH 2/2] nbd-tool.6.0.0: disable tests on alpine and macos Signed-off-by: Pau Ruiz Safont --- packages/nbd-tool/nbd-tool.6.0.0/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nbd-tool/nbd-tool.6.0.0/opam b/packages/nbd-tool/nbd-tool.6.0.0/opam index 6eb591ed70d4..b040165e4d7c 100644 --- a/packages/nbd-tool/nbd-tool.6.0.0/opam +++ b/packages/nbd-tool/nbd-tool.6.0.0/opam @@ -31,7 +31,7 @@ build: [ ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] ["dune" "build" "-p" name "-j" jobs "@doc"] {with-doc} - ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test} + ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test & os != "macos" & os-distribution != "alpine"} ] dev-repo: "git+https://github.com/xapi-project/nbd.git" url {