Revert mgs branch to main

oxidecomputer · Oct 11, 2024 · 420caa1 · 420caa1
1 parent 2629bb7
commit 420caa1
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -118,12 +118,12 @@ vcell = { version = "0.1.2", default-features = false }
 walkdir = { version = "2.0.0", default-features = false }
 zerocopy = { version = "0.6.1", default-features = false }
 zeroize = { version = "1.5.7", default-features = false, features = ["zeroize_derive"] }
-zip = { version = "0.6", default-features = false, features = ["bzip2"] }
+zip = { version = "0.6", default-features = false, features = ["bzip2", "deflate", "zstd"] }
 
 # Oxide forks and repos
 attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.4.0" }
 dice-mfg-msgs = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.2.1" }
-gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"], branch = "sp5-host-cpu-component" }
+gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"] }
 gimlet-inspector-protocol = { git = "https://github.com/oxidecomputer/gimlet-inspector-protocol", version = "0.1.0" }
 hif = { git = "https://github.com/oxidecomputer/hif", default-features = false }
 humpty = { git = "https://github.com/oxidecomputer/humpty", default-features = false, version = "0.1.3" }

diff --git a/build/xtask/src/dist.rs b/build/xtask/src/dist.rs
@@ -2971,7 +2971,7 @@ impl Archive {
             tmp_path,
             inner,
             opts: zip::write::FileOptions::default()
-                .compression_method(zip::CompressionMethod::Bzip2),
+                .compression_method(zip::CompressionMethod::Deflated),
         })
     }