Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opam: fix circular dependency by splitting xapi-tracing #5584

Merged
merged 4 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;\
Expand Down
19 changes: 4 additions & 15 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@
(name xapi-tracing)
)

(package
(name xapi-tracing-export)
)

(package
(name xapi-storage-script)
)
Expand Down Expand Up @@ -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")
Expand Down
6 changes: 6 additions & 0 deletions ocaml/idl/datamodel_lifecycle.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we commit these now then will they be correctly updated the next time we tag it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, see e3602e1

| "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" ->
Expand Down
2 changes: 1 addition & 1 deletion ocaml/libs/tracing/dune
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ocaml/xenopsd/lib/dune
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
xapi-stdext-threads
xapi-stdext-unix
xapi-tracing
xapi-tracing.export
xapi-tracing-export
xmlm
)
(preprocess
Expand Down
1 change: 0 additions & 1 deletion xapi-squeezed.opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
authors: ["[email protected]"]
license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
opam-version: "2.0"
author: "[email protected]"
maintainer: "[email protected]"
homepage: "https://github.com/xapi-project/xen-api"
bug-reports: "https://github.com/xapi-project/xen-api/issues"
Expand Down
1 change: 0 additions & 1 deletion xapi-squeezed.opam.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
opam-version: "2.0"
author: "[email protected]"
maintainer: "[email protected]"
homepage: "https://github.com/xapi-project/xen-api"
bug-reports: "https://github.com/xapi-project/xen-api/issues"
Expand Down
34 changes: 0 additions & 34 deletions xapi-stdext.opam

This file was deleted.

32 changes: 32 additions & 0 deletions xapi-tracing-export.opam
Original file line number Diff line number Diff line change
@@ -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: "[email protected]"
authors: "[email protected]"
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"
}
Loading