Skip to content

Commit 19059b1

Browse files
leftwoAlan Hanson
and
Alan Hanson
authored
Update Crucible and Propolis versions (#4795)
Propolis changes since the last update: Gripe when using non-raw block device Update zerocopy dependency nvme: Wire up GetFeatures command Make Viona more robust in the face of errors bump softnpu (#577) Modernize 16550 UART Crucible changes since the last update: Don't check ROP if the scrub is done (#1093) Allow crutest cli to be quiet on generic test (#1070) Offload write encryption (#1066) Simplify handling of BlockReq at program exit (#1085) Update Rust crate byte-unit to v5 (#1054) Remove unused fields in match statements, downstairs edition (#1084) Remove unused fields in match statements and consolidate (#1083) Add logger to Guest (#1082) Drive hash / decrypt tests from Upstairs::apply Wait to reconnect if auto_promote is false Change guest work id from u64 -> GuestWorkId remove BlockOp::Commit (#1072) Various clippy fixes (#1071) Don't panic if tasks are destroyed out of order Update Rust crate reedline to 0.27.1 (#1074) Update Rust crate async-trait to 0.1.75 (#1073) Buffer should destructure to Vec when single-referenced Don't fail to make unencrypted regions (#1067) Fix shadowing in downstairs (#1063) Single-task refactoring (#1058) Update Rust crate tokio to 1.35 (#1052) Update Rust crate openapiv3 to 2.0.0 (#1050) Update Rust crate libc to 0.2.151 (#1049) Update Rust crate rusqlite to 0.30 (#1035) --------- Co-authored-by: Alan Hanson <alan@oxide.computer>
1 parent 1416ee0 commit 19059b1

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ cookie = "0.18"
172172
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
173173
crossbeam = "0.8"
174174
crossterm = { version = "0.27.0", features = ["event-stream"] }
175-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "fab27994d0bd12725c17d6b478a9bfc2673ad6f4" }
176-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "fab27994d0bd12725c17d6b478a9bfc2673ad6f4" }
177-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "fab27994d0bd12725c17d6b478a9bfc2673ad6f4" }
175+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e71b10d2f9f1fb52818b916bae83ba15a339548d" }
176+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e71b10d2f9f1fb52818b916bae83ba15a339548d" }
177+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "e71b10d2f9f1fb52818b916bae83ba15a339548d" }
178178
curve25519-dalek = "4"
179179
datatest-stable = "0.2.3"
180180
display-error-chain = "0.2.0"
@@ -295,9 +295,9 @@ prettyplease = "0.2.16"
295295
proc-macro2 = "1.0"
296296
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
297297
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
298-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "f1571ce141421cff3d3328f43e7722f5df96fdda" }
299-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "f1571ce141421cff3d3328f43e7722f5df96fdda" }
300-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "f1571ce141421cff3d3328f43e7722f5df96fdda" }
298+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "1e25649e8c2ac274bd04adfe0513dd14a482058c" }
299+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "1e25649e8c2ac274bd04adfe0513dd14a482058c" }
300+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "1e25649e8c2ac274bd04adfe0513dd14a482058c" }
301301
proptest = "1.4.0"
302302
quote = "1.0"
303303
rand = "0.8.5"

package-manifest.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,21 +396,21 @@ only_for_targets.image = "standard"
396396
# 3. Use source.type = "manual" instead of "prebuilt"
397397
source.type = "prebuilt"
398398
source.repo = "crucible"
399-
source.commit = "fab27994d0bd12725c17d6b478a9bfc2673ad6f4"
399+
source.commit = "e71b10d2f9f1fb52818b916bae83ba15a339548d"
400400
# The SHA256 digest is automatically posted to:
401401
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
402-
source.sha256 = "850b468c308cf63ef9e10addee36a923a91b7ab64af0fa0836130c830fb42863"
402+
source.sha256 = "030a02551e487f561bcfad47426b953d15c4430d77770765c7fc03afd8d61bd9"
403403
output.type = "zone"
404404

405405
[package.crucible-pantry]
406406
service_name = "crucible_pantry"
407407
only_for_targets.image = "standard"
408408
source.type = "prebuilt"
409409
source.repo = "crucible"
410-
source.commit = "fab27994d0bd12725c17d6b478a9bfc2673ad6f4"
410+
source.commit = "e71b10d2f9f1fb52818b916bae83ba15a339548d"
411411
# The SHA256 digest is automatically posted to:
412412
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
413-
source.sha256 = "893f845caa5d9b146137b503e80d5615cbd6e9d393745e81e772b10a9072b58b"
413+
source.sha256 = "c74e23e7f7995ba3a69a9ec3a31f1db517ec15cd3a9942c2c07621b219b743b2"
414414
output.type = "zone"
415415

416416
# Refer to
@@ -421,10 +421,10 @@ service_name = "propolis-server"
421421
only_for_targets.image = "standard"
422422
source.type = "prebuilt"
423423
source.repo = "propolis"
424-
source.commit = "f1571ce141421cff3d3328f43e7722f5df96fdda"
424+
source.commit = "1e25649e8c2ac274bd04adfe0513dd14a482058c"
425425
# The SHA256 digest is automatically posted to:
426426
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
427-
source.sha256 = "6e2607f103419a6338936434f3e67afb7cbe14d6397f2d01982ba94b8d0182a9"
427+
source.sha256 = "09c124315da3e434c85fe1ddb16459c36d8302e15705ff18fe6bbc7b4876f5f9"
428428
output.type = "zone"
429429

430430
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)