From 64228f483acad797fa4ea96fcb750de0aeea5ceb Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Tue, 2 Jul 2024 20:45:44 +0000 Subject: [PATCH] Update Crucible to add back support for SQLite Crucible goes to: e10f8793f8414fdb9a165219f17e45fa014d088b Propolis goes to: 5ebf9626e0ad274eb515d206d102cb09d2d51f15 --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 12 ++++++------ package-manifest.toml | 16 ++++++++-------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a77a6bbdc..6d04ceba44 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -464,9 +464,9 @@ dependencies = [ [[package]] name = "bhyve_api" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459#59868677c70f3cd03f03e12584ad1056da8b5459" +source = "git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15#5ebf9626e0ad274eb515d206d102cb09d2d51f15" dependencies = [ - "bhyve_api_sys 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459)", + "bhyve_api_sys 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15)", "libc", "strum", ] @@ -484,7 +484,7 @@ dependencies = [ [[package]] name = "bhyve_api_sys" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459#59868677c70f3cd03f03e12584ad1056da8b5459" +source = "git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15#5ebf9626e0ad274eb515d206d102cb09d2d51f15" dependencies = [ "libc", "strum", @@ -1398,7 +1398,7 @@ dependencies = [ [[package]] name = "crucible-agent-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=64e28cea69b427b05064defaf8800a4d678b4612#64e28cea69b427b05064defaf8800a4d678b4612" +source = "git+https://github.com/oxidecomputer/crucible?rev=e10f8793f8414fdb9a165219f17e45fa014d088b#e10f8793f8414fdb9a165219f17e45fa014d088b" dependencies = [ "anyhow", "chrono", @@ -1414,7 +1414,7 @@ dependencies = [ [[package]] name = "crucible-pantry-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=64e28cea69b427b05064defaf8800a4d678b4612#64e28cea69b427b05064defaf8800a4d678b4612" +source = "git+https://github.com/oxidecomputer/crucible?rev=e10f8793f8414fdb9a165219f17e45fa014d088b#e10f8793f8414fdb9a165219f17e45fa014d088b" dependencies = [ "anyhow", "chrono", @@ -1431,7 +1431,7 @@ dependencies = [ [[package]] name = "crucible-smf" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=64e28cea69b427b05064defaf8800a4d678b4612#64e28cea69b427b05064defaf8800a4d678b4612" +source = "git+https://github.com/oxidecomputer/crucible?rev=e10f8793f8414fdb9a165219f17e45fa014d088b#e10f8793f8414fdb9a165219f17e45fa014d088b" dependencies = [ "crucible-workspace-hack", "libc", @@ -3488,7 +3488,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "bhyve_api 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459)", + "bhyve_api 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15)", "byteorder", "camino", "camino-tempfile", @@ -5553,7 +5553,7 @@ dependencies = [ "pq-sys", "pretty_assertions", "progenitor-client", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15)", "rand 0.8.5", "rcgen", "ref-cast", @@ -5803,7 +5803,7 @@ dependencies = [ "oximeter-producer", "oxnet", "pretty_assertions", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15)", "propolis-mock-server", "rand 0.8.5", "rcgen", @@ -7267,7 +7267,7 @@ dependencies = [ [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459#59868677c70f3cd03f03e12584ad1056da8b5459" +source = "git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15#5ebf9626e0ad274eb515d206d102cb09d2d51f15" dependencies = [ "async-trait", "base64 0.21.7", @@ -7309,7 +7309,7 @@ dependencies = [ [[package]] name = "propolis-mock-server" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459#59868677c70f3cd03f03e12584ad1056da8b5459" +source = "git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15#5ebf9626e0ad274eb515d206d102cb09d2d51f15" dependencies = [ "anyhow", "atty", @@ -7319,7 +7319,7 @@ dependencies = [ "futures", "hyper 0.14.28", "progenitor", - "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459)", + "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15)", "rand 0.8.5", "reqwest", "schemars", @@ -7351,7 +7351,7 @@ dependencies = [ [[package]] name = "propolis_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=59868677c70f3cd03f03e12584ad1056da8b5459#59868677c70f3cd03f03e12584ad1056da8b5459" +source = "git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15#5ebf9626e0ad274eb515d206d102cb09d2d51f15" dependencies = [ "schemars", "serde", diff --git a/Cargo.toml b/Cargo.toml index 79fee6e947..d8449480d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -260,9 +260,9 @@ cookie = "0.18" criterion = { version = "0.5.1", features = [ "async_tokio" ] } crossbeam = "0.8" crossterm = { version = "0.27.0", features = ["event-stream"] } -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "64e28cea69b427b05064defaf8800a4d678b4612" } -crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "64e28cea69b427b05064defaf8800a4d678b4612" } -crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "64e28cea69b427b05064defaf8800a4d678b4612" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e10f8793f8414fdb9a165219f17e45fa014d088b" } +crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e10f8793f8414fdb9a165219f17e45fa014d088b" } +crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "e10f8793f8414fdb9a165219f17e45fa014d088b" } csv = "1.3.0" curve25519-dalek = "4" datatest-stable = "0.2.9" @@ -408,9 +408,9 @@ prettyplease = { version = "0.2.20", features = ["verbatim"] } proc-macro2 = "1.0" progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" } progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" } -bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "59868677c70f3cd03f03e12584ad1056da8b5459" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "59868677c70f3cd03f03e12584ad1056da8b5459" } -propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "59868677c70f3cd03f03e12584ad1056da8b5459" } +bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "5ebf9626e0ad274eb515d206d102cb09d2d51f15" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "5ebf9626e0ad274eb515d206d102cb09d2d51f15" } +propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "5ebf9626e0ad274eb515d206d102cb09d2d51f15" } proptest = "1.4.0" quote = "1.0" rand = "0.8.5" diff --git a/package-manifest.toml b/package-manifest.toml index f5c3ff8f5c..1c39dcb151 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -504,10 +504,10 @@ only_for_targets.image = "standard" # 3. Use source.type = "manual" instead of "prebuilt" source.type = "prebuilt" source.repo = "crucible" -source.commit = "64e28cea69b427b05064defaf8800a4d678b4612" +source.commit = "e10f8793f8414fdb9a165219f17e45fa014d088b" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt -source.sha256 = "e9051934c7d6e274158d4afdb4523797c913acd1a1262f973bc0ab7a2a253b5f" +source.sha256 = "e3f7ace2da974da6379485c6871ffc88ce7430c9ff519d5ac9dc04c55ce9f189" output.type = "zone" output.intermediate_only = true @@ -516,10 +516,10 @@ service_name = "crucible_pantry_prebuilt" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "64e28cea69b427b05064defaf8800a4d678b4612" +source.commit = "e10f8793f8414fdb9a165219f17e45fa014d088b" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-pantry.sha256.txt -source.sha256 = "a8850bfaf08c11a7baa2e4b14b859613b77d9952dc8d20433ebea8136f8a00d3" +source.sha256 = "a5505a51871e910735f449acb6887610a08244773e19d474f66cb00e533842d0" output.type = "zone" output.intermediate_only = true @@ -533,10 +533,10 @@ service_name = "crucible_dtrace" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "64e28cea69b427b05064defaf8800a4d678b4612" +source.commit = "e10f8793f8414fdb9a165219f17e45fa014d088b" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-dtrace.sha256.txt -source.sha256 = "fe51b1c771f990761c4f8bf95aa26febbfa452df97f8da7d2f329dad88f63e1d" +source.sha256 = "29e79e0df79fc46b244745fac807b0e1817954c0a17b1923d725f257d31010e9" output.type = "tarball" # Refer to @@ -547,10 +547,10 @@ service_name = "propolis-server" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "propolis" -source.commit = "59868677c70f3cd03f03e12584ad1056da8b5459" +source.commit = "5ebf9626e0ad274eb515d206d102cb09d2d51f15" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -source.sha256 = "4ab62342141c655a2bf088ff608fa353063bc3ac44db459e9d56768aa5f4e3d2" +source.sha256 = "0398e7294beaa46636eb1c0703593f67b35366aa3637e9bd0e70ded9f022a9ab" output.type = "zone" [package.mg-ddm-gz]