Skip to content

Commit 12dc542

Browse files
committed
Addressing reviewer comments
1 parent 259e3ea commit 12dc542

File tree

11 files changed

+325
-488
lines changed

11 files changed

+325
-488
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,5 @@ members = [
2323
exclude = ["examples"]
2424

2525
[patch.crates-io]
26-
libc = { git = "https://github.com/fortanix/libc.git", branch = "fortanixvme" }
27-
serde = { git = "https://github.com/raoulstrackx/serde.git", branch = "raoul/stdlib" }
28-
serde_cbor = { git = "https://github.com/raoulstrackx/cbor.git", branch = "raoul/stdlib" }
29-
nix_22 = { git = "https://github.com/raoulstrackx/nix.git", branch = "raoul/fortanixvme_r0.22.4", package = "nix" }
26+
serde = { git = "https://github.com/fortanix/serde.git", branch = "master" }
3027
vsock = { git = "https://github.com/raoulstrackx/vsock-rs.git", branch = "raoul/fortanixvme" }

fortanix-vme/ci-common.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function has_vsock_loopback {
1717
if [[ $(lsmod | grep vsock_loopback) ]]; then
1818
vsock_loopback=1
1919
else
20-
echo "You have an vsock loopback capable kernel, but the vsock_loopback module isn't loaded. Please run \'sudo modprobe vsock_loopback\'"
20+
echo "You have a vsock loopback capable kernel, but the vsock_loopback module isn't loaded. Please run \'sudo modprobe vsock_loopback\'"
2121
exit -1
2222
fi
2323
fi
@@ -58,10 +58,10 @@ function compile {
5858
VME_TARGET="${TOOLCHAIN_DIR}/rust/rustup/toolchains/${toolchain_version}/lib/rustlib/x86_64-unknown-linux-fortanixvme/x86_64-unknown-linux-fortanixvme.json"
5959
CC=musl-gcc \
6060
RUSTFLAGS="-Clink-self-contained=yes" \
61-
cargo +${toolchain_version} build --release --target ${VME_TARGET} -Zbuild-std
61+
cargo +${toolchain_version} build --locked --release --target ${VME_TARGET} -Zbuild-std
6262

6363
# use elf as an output variable
64-
elf=${repo_root}/fortanix-vme/target/x86_64-unknown-linux-fortanixvme/release/${name}
64+
elf=${repo_root}/target/x86_64-unknown-linux-fortanixvme/release/${name}
6565
}
6666

6767
function cargo_test {

0 commit comments

Comments
 (0)