dsg/cloud-hypervisor
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "build: drop clap from dev-dependencies"

Browse source 
This reverts commit 998fb48ff2.

This is breaking the release build process (cross build for aarch64
musl) so temporarily reverting until we can identify the cause to allow
the release proceeed.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2023-01-13 10:52:33 +00:00
parent 3df82337f1
commit 375e094c77
6 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -43,6 +43,9 @@ vmm = { path = "vmm" }
vmm-sys-util = "0.11.0"
vm-memory = "0.10.0"
[build-dependencies]
clap = { version = "4.0.29", features = ["cargo"] }
# List of patched crates
[patch.crates-io]
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx" }

5
build.rs
View file

@ -3,10 +3,13 @@
// SPDX-License-Identifier: Apache-2.0
//
#[macro_use(crate_version)]
extern crate clap;
use std::process::Command;
fn main() {
let mut version = "v".to_owned() + env!("CARGO_PKG_VERSION");
let mut version = "v".to_owned() + crate_version!();
if let Ok(git_out) = Command::new("git").args(["describe", "--dirty"]).output() {
if git_out.status.success() {

3
performance-metrics/Cargo.toml
View file

@ -13,3 +13,6 @@ serde_json = "1.0.89"
test_infra = { path = "../test_infra" }
thiserror = "1.0.38"
wait-timeout = "0.2.0"
[build-dependencies]
clap = { version = "4.0.29", features = ["cargo"] }

6
performance-metrics/build.rs
View file

@ -3,11 +3,13 @@
// SPDX-License-Identifier: Apache-2.0
//
#[macro_use(crate_version)]
extern crate clap;
use std::process::Command;
fn main() {
let mut git_human_readable = "v".to_owned() + env!("CARGO_PKG_VERSION");
let mut git_human_readable = "v".to_owned() + crate_version!();
if let Ok(git_out) = Command::new("git").args(["describe", "--dirty"]).output() {
if git_out.status.success() {
if let Ok(git_out_str) = String::from_utf8(git_out.stdout) {

2
vhost_user_block/Cargo.toml
View file

@ -20,3 +20,5 @@ virtio-queue = "0.7.0"
vm-memory = "0.10.0"
vmm-sys-util = "0.11.0"
[build-dependencies]
clap = { version = "4.0.29", features = ["cargo"] }

2
vhost_user_net/Cargo.toml
View file

@ -18,3 +18,5 @@ virtio-bindings = "0.1.0"
vm-memory = "0.10.0"
vmm-sys-util = "0.11.0"
[build-dependencies]
clap = { version = "4.0.29", features = ["cargo"] }