diff --git a/Makefile b/Makefile index 43ebc394d85..897862dab52 100644 --- a/Makefile +++ b/Makefile @@ -255,7 +255,7 @@ install: build doc sdk doc-json message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli \ xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix \ xapi-rrd xapi-inventory \ - xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-stdext + xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck # docs mkdir -p $(DESTDIR)$(DOCDIR) cp -r $(XAPIDOC)/jekyll $(DESTDIR)$(DOCDIR) @@ -277,7 +277,7 @@ uninstall: message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-log \ xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix \ xapi-rrd xapi-inventory \ - xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-stdext + xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck compile_flags.txt: Makefile (ocamlc -config-var ocamlc_cflags;\ diff --git a/dune-project b/dune-project index 747fc62b133..20058ef9e72 100644 --- a/dune-project +++ b/dune-project @@ -66,6 +66,10 @@ (name xapi-tracing) ) +(package + (name xapi-tracing-export) +) + (package (name xapi-storage-script) ) @@ -262,21 +266,6 @@ (name xapi-inventory) ) -(package - (name xapi-stdext) - (synopsis "Xapi's standard library extension") - (description "Dummy package that enables the usage of dune-release") - (depends - (xapi-stdext-date (= :version)) - (xapi-stdext-encodings (= :version)) - (xapi-stdext-pervasives (= :version)) - (xapi-stdext-std (= :version)) - (xapi-stdext-threads (= :version)) - (xapi-stdext-unix (= :version)) - (xapi-stdext-zerocheck (= :version)) - ) -) - (package (name xapi-stdext-date) (synopsis "Xapi's standard library extension, Dates") diff --git a/ocaml/idl/datamodel_lifecycle.ml b/ocaml/idl/datamodel_lifecycle.ml index 28ff931ec59..94870d262c7 100644 --- a/ocaml/idl/datamodel_lifecycle.ml +++ b/ocaml/idl/datamodel_lifecycle.ml @@ -109,6 +109,12 @@ let prototyped_of_message = function Some "22.20.0" | "Repository", "set_gpgkey_path" -> Some "22.12.0" + | "PCI", "get_dom0_access_status" -> + Some "24.13.0-next" + | "PCI", "enable_dom0_access" -> + Some "24.13.0-next" + | "PCI", "disable_dom0_access" -> + Some "24.13.0-next" | "message", "destroy_many" -> Some "22.19.0" | "VTPM", "set_contents" -> diff --git a/ocaml/libs/tracing/dune b/ocaml/libs/tracing/dune index 6c18e2f15c1..0e1160818c2 100644 --- a/ocaml/libs/tracing/dune +++ b/ocaml/libs/tracing/dune @@ -7,7 +7,7 @@ (library (name tracing_export) (modules tracing_export) - (public_name xapi-tracing.export) + (public_name xapi-tracing-export) (libraries cohttp cohttp-posix diff --git a/ocaml/xenopsd/lib/dune b/ocaml/xenopsd/lib/dune index 0521c4b3db4..9f0a63e064c 100644 --- a/ocaml/xenopsd/lib/dune +++ b/ocaml/xenopsd/lib/dune @@ -42,7 +42,7 @@ xapi-stdext-threads xapi-stdext-unix xapi-tracing - xapi-tracing.export + xapi-tracing-export xmlm ) (preprocess diff --git a/xapi-squeezed.opam b/xapi-squeezed.opam index 978e98953f7..52dd6fdc3dc 100644 --- a/xapi-squeezed.opam +++ b/xapi-squeezed.opam @@ -2,7 +2,6 @@ authors: ["xen-api@lists.xen.org"] license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" opam-version: "2.0" -author: "dave.scott@eu.citrix.com" maintainer: "xen-api@lists.xen.org" homepage: "https://github.com/xapi-project/xen-api" bug-reports: "https://github.com/xapi-project/xen-api/issues" diff --git a/xapi-squeezed.opam.template b/xapi-squeezed.opam.template index fc590e1df24..84ad0840a82 100644 --- a/xapi-squeezed.opam.template +++ b/xapi-squeezed.opam.template @@ -1,5 +1,4 @@ opam-version: "2.0" -author: "dave.scott@eu.citrix.com" maintainer: "xen-api@lists.xen.org" homepage: "https://github.com/xapi-project/xen-api" bug-reports: "https://github.com/xapi-project/xen-api/issues" diff --git a/xapi-stdext.opam b/xapi-stdext.opam deleted file mode 100644 index e2654f782ab..00000000000 --- a/xapi-stdext.opam +++ /dev/null @@ -1,34 +0,0 @@ -# This file is generated by dune, edit dune-project instead -opam-version: "2.0" -synopsis: "Xapi's standard library extension" -description: "Dummy package that enables the usage of dune-release" -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" {>= "2.0"} - "xapi-stdext-date" {= version} - "xapi-stdext-encodings" {= version} - "xapi-stdext-pervasives" {= version} - "xapi-stdext-std" {= version} - "xapi-stdext-threads" {= version} - "xapi-stdext-unix" {= version} - "xapi-stdext-zerocheck" {= version} -] -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/xapi-project/xen-api.git" diff --git a/xapi-tracing-export.opam b/xapi-tracing-export.opam new file mode 100644 index 00000000000..c58065eb2a3 --- /dev/null +++ b/xapi-tracing-export.opam @@ -0,0 +1,32 @@ +# This file is generated by dune, edit dune-project instead +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" +opam-version: "2.0" +maintainer: "xen-api@lists.xen.org" +authors: "xen-api@lists.xen.org" +homepage: "https://xapi-project.github.io/" +bug-reports: "https://github.com/xapi-project/xen-api.git" +dev-repo: "git+https://github.com/xapi-project/xen-api.git" +build: [[ "dune" "build" "-p" name "-j" jobs ]] + +available: [ os = "linux" ] +depends: [ + "ocaml" + "cohttp-posix" + "dune" + "cohttp" + "rpclib" + "xapi-log" + "xapi-open-uri" + "xapi-stdext-threads" + "xapi-stdext-unix" + "xapi-tracing" + "zstd" +] +synopsis: "Library required by xapi" +description: """ +These libraries are provided for backwards compatibility only. +No new code should use these libraries.""" +url { + src: + "https://github.com/xapi-project/xen-api/archive/master.tar.gz" +}