From 9773407e090742e642953e14c24fe4d7d8092ef0 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Thu, 3 Oct 2024 08:54:19 +0100 Subject: [PATCH] xs-extra: remove xapi's async packages These have been removed and can't be built anymore. The upstream async packages are kept for the time being Signed-off-by: Pau Ruiz Safont --- .../xs-extra-dummy/xs-toolstack.master/opam | 1 - .../xs-extra/message-switch-async.master/opam | 35 ----------------- packages/xs-extra/message-switch.master/opam | 1 - packages/xs-extra/xapi-idl.master/opam | 1 - .../xs-extra/xapi-storage-script.master/opam | 1 - .../xs-extra/xen-api-client-async.master/opam | 38 ------------------- tools/sync-xapi-metadata.sh | 2 - tools/update-xs-extra.sh | 2 - 8 files changed, 81 deletions(-) delete mode 100644 packages/xs-extra/message-switch-async.master/opam delete mode 100644 packages/xs-extra/xen-api-client-async.master/opam diff --git a/packages/xs-extra-dummy/xs-toolstack.master/opam b/packages/xs-extra-dummy/xs-toolstack.master/opam index f88c4f56..dee094ea 100644 --- a/packages/xs-extra-dummy/xs-toolstack.master/opam +++ b/packages/xs-extra-dummy/xs-toolstack.master/opam @@ -45,7 +45,6 @@ depends: [ "xapi-tools" "xe" "xen-api-client" - "xen-api-client-async" "xml-light2" "zstd" ] diff --git a/packages/xs-extra/message-switch-async.master/opam b/packages/xs-extra/message-switch-async.master/opam deleted file mode 100644 index ac53e522..00000000 --- a/packages/xs-extra/message-switch-async.master/opam +++ /dev/null @@ -1,35 +0,0 @@ -# This file is generated by dune, edit dune-project instead -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" -opam-version: "2.0" -name: "message-switch-async" -maintainer: "xen-api@lists.xen.org" -authors: [ "xen-api@lists.xen.org" ] -homepage: "https://github.com/xapi-project/xen-api" -bug-reports: "https://github.com/xapi-project/xen-api/issues" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -tags: [ "org:xapi-project" ] -build: [ - ["./configure" "--prefix" "%{prefix}%"] - [ "dune" "build" "-p" name "-j" jobs ] -] -depends: [ - "ocaml" - "dune" {>= "3.15"} - "odoc" {with-doc} - "async" {>= "v0.9.0"} - "async_kernel" - "async_unix" - "base" - "core" - "core_kernel" - "core_unix" - "cohttp-async" {>= "1.0.2"} - "message-switch-core" -] -synopsis: "A simple store-and-forward message switch" -description: """ -The switch stores messages in queues with well-known names. Clients use -a simple HTTP protocol to enqueue and dequeue messages.""" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/packages/xs-extra/message-switch.master/opam b/packages/xs-extra/message-switch.master/opam index 4ee77fdc..18342b52 100644 --- a/packages/xs-extra/message-switch.master/opam +++ b/packages/xs-extra/message-switch.master/opam @@ -22,7 +22,6 @@ depends: [ "cohttp-lwt-unix" "io-page" {>= "2.4.0"} "lwt_log" - "message-switch-async" {with-test} "message-switch-lwt" "message-switch-unix" "mirage-block-unix" {>= "2.4.0"} diff --git a/packages/xs-extra/xapi-idl.master/opam b/packages/xs-extra/xapi-idl.master/opam index c1fff027..cd394e55 100644 --- a/packages/xs-extra/xapi-idl.master/opam +++ b/packages/xs-extra/xapi-idl.master/opam @@ -22,7 +22,6 @@ depends: [ "ipaddr" "logs" "lwt" {>= "5.0.0"} - "message-switch-async" {with-test} "message-switch-core" "message-switch-unix" "mtime" diff --git a/packages/xs-extra/xapi-storage-script.master/opam b/packages/xs-extra/xapi-storage-script.master/opam index a8df41ef..bdfd493e 100644 --- a/packages/xs-extra/xapi-storage-script.master/opam +++ b/packages/xs-extra/xapi-storage-script.master/opam @@ -21,7 +21,6 @@ depends: [ "async_unix" {>= "112.24.00"} "core" "message-switch-unix" - "message-switch-async" "rpclib" "rpclib-async" "ppx_deriving_rpc" diff --git a/packages/xs-extra/xen-api-client-async.master/opam b/packages/xs-extra/xen-api-client-async.master/opam deleted file mode 100644 index c283cb6d..00000000 --- a/packages/xs-extra/xen-api-client-async.master/opam +++ /dev/null @@ -1,38 +0,0 @@ -# This file is generated by dune, edit dune-project instead - -opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: [ "David Scott" "Anil Madhavapeddy" "Jerome Maloberti" "John Else" "Jon Ludlam" "Thomas Sanders" "Mike McClurg" ] -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" -homepage: "https://github.com/xapi-project/xen-api" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -bug-reports: "https://github.com/xapi-project/xen-api/issues" -tags: [ - "org:xapi-project" -] -build: [ - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "ocaml" - "dune" {>= "3.15"} - "async" {>= "v0.9.0"} - "async_kernel" - "async_unix" - "base" - "base-threads" - "cohttp" {>= "0.22.0"} - "core" - "core_kernel" - "core_unix" - "rpclib" - "uri" - "xen-api-client" - "xmlm" -] -synopsis: - "Xen-API client library for remotely-controlling a xapi host" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/tools/sync-xapi-metadata.sh b/tools/sync-xapi-metadata.sh index 6f55b8c7..430dbe2c 100755 --- a/tools/sync-xapi-metadata.sh +++ b/tools/sync-xapi-metadata.sh @@ -14,7 +14,6 @@ forkexec $XAPI/xen-api gzip $XAPI/xen-api http-lib $XAPI/xen-api message-switch $XAPI/xen-api -message-switch-async $XAPI/xen-api message-switch-cli $XAPI/xen-api message-switch-core $XAPI/xen-api message-switch-lwt $XAPI/xen-api @@ -62,7 +61,6 @@ xapi-tracing-export $XAPI/xen-api xapi-types $XAPI/xen-api xe $XAPI/xen-api xen-api-client $XAPI/xen-api -xen-api-client-async $XAPI/xen-api xen-api-client-lwt $XAPI/xen-api xenctrl $XAPI/xenctrl xenmmap $XAPI/xenctrl diff --git a/tools/update-xs-extra.sh b/tools/update-xs-extra.sh index 8fba278f..2299a872 100755 --- a/tools/update-xs-extra.sh +++ b/tools/update-xs-extra.sh @@ -14,7 +14,6 @@ forkexec $XAPI/xen-api gzip $XAPI/xen-api http-lib $XAPI/xen-api message-switch $XAPI/xen-api -message-switch-async $XAPI/xen-api message-switch-cli $XAPI/xen-api message-switch-core $XAPI/xen-api message-switch-lwt $XAPI/xen-api @@ -73,7 +72,6 @@ xapi-xenopsd-simulator $XAPI/xen-api xapi-xenopsd-xc $XAPI/xen-api xe $XAPI/xen-api xen-api-client $XAPI/xen-api -xen-api-client-async $XAPI/xen-api xen-api-client-lwt $XAPI/xen-api xenctrl $XAPI/xenctrl xenmmap $XAPI/xenctrl