Merge pull request #633 from psafont/ezxenstore

xapi-project · Apr 21, 2023 · 38873ef · 38873ef
2 parents c61afb1 + 3de800a
commit 38873ef
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 47 deletions.
diff --git a/.github/duplicates-upstream-extra.txt b/.github/duplicates-upstream-extra.txt
@@ -1,4 +1,3 @@
-xenctrl
 ocaml
 ocaml-base-compiler
 ocaml-system
diff --git a/.github/duplicates-xs-toolstack.txt b/.github/duplicates-xs-toolstack.txt
@@ -1,4 +1,3 @@
-xenctrl
 ocaml
 ocaml-base-compiler
 ocaml-system
diff --git a/packages/xs-extra-dummy/xs-toolstack.master/opam b/packages/xs-extra-dummy/xs-toolstack.master/opam
@@ -56,7 +56,6 @@ depends: [
   "xen-api-client"
   "xen-api-client-async"
   "xen-api-sdk"
-  "xenctrl"
   "xml-light2"
   "zstd"
 ]
diff --git a/packages/xs/ezxenstore.0.4.2/opam → packages/xs-extra/ezxenstore.master/opam b/packages/xs/ezxenstore.0.4.2/opam → packages/xs-extra/ezxenstore.master/opam
@@ -23,7 +23,5 @@ An easy-to-use xenstore library with a simplified interface geared
 towards use within a daemon that maintains a single connection to
 xenstored."""
 url {
-  src:
-    "https://github.com/xapi-project/ezxenstore/archive/v0.4.2.tar.gz"
-  checksum: "sha256=709ba936f8b1a3c76e31c655752294287f215601b3238204688818676c6e7d97"
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
diff --git a/packages/xs-extra/xapi-xenopsd-xc.master/opam b/packages/xs-extra/xapi-xenopsd-xc.master/opam
@@ -45,7 +45,6 @@ depends: [
   "xenctrl"
   "xenstore"
   "xenstore_transport"
-  "xentoollog"
 ]
 synopsis:
   "A xenops plugin which knows how to use xenstore, xenctrl and xenguest to manage"

diff --git a/packages/xs-extra/xentoollog.master/opam b/packages/xs-extra/xentoollog.master/opam
diff --git a/packages/xs/xenctrl.dummy/opam b/packages/xs/xenctrl.dummy/opam
diff --git a/packages/xs/xenctrl.dummy/url.local b/packages/xs/xenctrl.dummy/url.local
diff --git a/tools/cleanup.sh b/tools/cleanup.sh
@@ -12,6 +12,6 @@ set -euo pipefail
 opam admin check --ignore-test-doc
 # there is a conflict in ppxlib and sexplib0 version in with-test, ignore its tests for now
 RESOLVE=$(opam admin filter --verbose --dry-run --resolve=xs-toolstack | sed -n 2p | grep -v ppxlib)
-RESOLVE+=" upstream-extra-dummy xenctrl.dummy opam-depext opam-ed.0.3"
+RESOLVE+=" upstream-extra-dummy opam-depext opam-ed.0.3"
 RESOLVE+=" ocaml-base-compiler.${OCAML_VERSION_FULL} ocaml-system.${OCAML_VERSION_FULL}"
 exec opam admin filter --dry-run "--resolve=$(echo ${RESOLVE} | tr ' ' ',')" --or --with-test
diff --git a/tools/no-duplicates-check.bash b/tools/no-duplicates-check.bash
@@ -16,11 +16,9 @@ function check_no_duplicates {
 }
 
 # makes sure no ordinary opam packages have more than a single version
-# the only exception is xenctrl.
 # This is required because of how the rpm distributions are built: they
 # try to install all versions of all ordinary packages, which fails because
 # the versions of a single package are never compatible.
-# xenctrl has 2 versions: dummy and master
 # several versions of the compiler might be wanted for testing:
 #   ocaml, ocaml-system, ocaml-base-compiler
 toolstack_packages=$(opam list --required-by "xs-toolstack" --recursive --short)