mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix/store): only depend on vhost-user-fs if virtiofs enabled

Browse source 
Change-Id: Iaf88d43df27b87548794a8dddc9a1e08279b8ffb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9471
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Florian Klink 2023-09-26 10:18:59 +03:00 committed by clbot
parent 10717605a2
commit 7062fdc132
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tvix/Cargo.nix
View file

@ -8729,7 +8729,6 @@ rec {
name = "fuse-backend-rs";
packageId = "fuse-backend-rs";
optional = true;
features = [ "vhost-user-fs" ];
}
{
name = "futures";
@ -8887,7 +8886,7 @@ rec {
"fuse" = [ "fs" ];
"reflection" = [ "tonic-reflection" ];
"tonic-reflection" = [ "dep:tonic-reflection" ];
"virtiofs" = [ "fs" "dep:vhost" "dep:vhost-user-backend" "dep:virtio-queue" "dep:vm-memory" "dep:vmm-sys-util" "dep:virtio-bindings" ];
"virtiofs" = [ "fs" "dep:vhost" "dep:vhost-user-backend" "dep:virtio-queue" "dep:vm-memory" "dep:vmm-sys-util" "dep:virtio-bindings" "fuse-backend-rs?/vhost-user-fs" "fuse-backend-rs?/virtiofs" ];
};
resolvedDefaultFeatures = [ "default" "fs" "fuse" "reflection" "tonic-reflection" "virtiofs" ];
};

17
tvix/store/Cargo.toml
View file

@ -37,11 +37,6 @@ optional = true
# TODO: Switch back to upstream version once https://github.com/cloud-hypervisor/fuse-backend-rs/pull/153 lands.
git = "https://github.com/cloud-hypervisor/fuse-backend-rs"
rev = "402e7c531bc75bc44ac366dc59477de8b5d4ca08"
# Ideally this would only be enabled if virtiofs is enabled
# Ex: virtiofs = [..., "fuse-backend-rs/?vhost-user-fs", ...]
# However, crate2nix doesn't properly understand this syntax and doesn't
# enable this feature properly.
features = ["vhost-user-fs"]
[dependencies.vhost]
optional = true
@ -87,6 +82,16 @@ tonic-mock = { git = "https://github.com/brainrake/tonic-mock", branch = "bump-d
[features]
default = ["fuse", "virtiofs", "reflection"]
fs = ["dep:libc", "dep:fuse-backend-rs"]
virtiofs = ["fs", "dep:vhost", "dep:vhost-user-backend", "dep:virtio-queue", "dep:vm-memory", "dep:vmm-sys-util", "dep:virtio-bindings"]
virtiofs = [
"fs",
"dep:vhost",
"dep:vhost-user-backend",
"dep:virtio-queue",
"dep:vm-memory",
"dep:vmm-sys-util",
"dep:virtio-bindings",
"fuse-backend-rs?/vhost-user-fs", # impl FsCacheReqHandler for SlaveFsCacheReq
"fuse-backend-rs?/virtiofs",
]
fuse = ["fs"]
reflection = ["tonic-reflection"]