mirror/ youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-05-10 09:36:13 +02:00
Code Issues

Upgrade oci-spec-rs to 0.4.0-with-bugfix version 

Signed-off-by: Takashi IIGUNI <iiguni.tks@gmail.com>
This commit is contained in:
Takashi IIGUNI 2021-09-12 07:27:28 +00:00
parent 3e09e3f9d8
commit ecf3370ba0
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.lock generated
View File

@ -579,8 +579,7 @@ dependencies = [
[[package]]
name = "oci-spec"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "648c6fbe66119beec0480447679616806a100de8b8818c7458052222660b6188"
source = "git+https://github.com/utam0k/oci-spec-rs/?tag=v0.4.0-with-bugfix#73540d3183136d0188b9c3a40f24b08295bbc92e"
dependencies = [
"cfg-if 1.0.0",
"quickcheck",

5
Cargo.toml
View File

@ -29,7 +29,7 @@ mio = { version = "0.7.13", features = ["os-ext", "os-poll"] }
chrono = { version="0.4", features = ["serde"] }
once_cell = "1.6.0"
futures = { version = "0.3", features = ["thread-pool"] }
oci-spec = "0.4.0"
oci-spec = { git="https://github.com/utam0k/oci-spec-rs/", tag = "v0.4.0-with-bugfix"}
cgroups = { version = "0.1.0", path = "./cgroups" }
systemd = { version = "0.8", default-features = false, optional = true }
dbus = "0.9.2"
@ -38,7 +38,8 @@ fastrand = "1.4.1"
crossbeam-channel = "0.5"
[dev-dependencies]
oci-spec = { version = "0.4.0", features = ["proptests"] }
# oci-spec = { version = "0.4.0", features = ["proptests"] }
oci-spec = { git = "https://github.com/utam0k/oci-spec-rs/", tag = "v0.4.0-with-bugfix", features = ["proptests"] }
quickcheck = "1"
serial_test = "0.5.1"

3
cgroups/Cargo.lock generated
View File

@ -419,8 +419,7 @@ dependencies = [
[[package]]
name = "oci-spec"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "648c6fbe66119beec0480447679616806a100de8b8818c7458052222660b6188"
source = "git+https://github.com/utam0k/oci-spec-rs/?tag=v0.4.0-with-bugfix#73540d3183136d0188b9c3a40f24b08295bbc92e"
dependencies = [
"cfg-if 1.0.0",
"quickcheck",

6
cgroups/Cargo.toml
View File

@ -14,7 +14,8 @@ nix = "0.22.0"
procfs = "0.10.1"
log = "0.4"
anyhow = "1.0"
oci-spec = "0.4.0"
# oci-spec = "0.4.0"
oci-spec = { git="https://github.com/utam0k/oci-spec-rs/", tag = "v0.4.0-with-bugfix"}
systemd = { version = "0.8", default-features = false, optional = true }
dbus = "0.9.2"
serde = { version = "1.0", features = ["derive"] }
@ -24,7 +25,8 @@ errno = { version = "0.2.7", optional = true }
libc = { version = "0.2.84", optional = true }
[dev-dependencies]
oci-spec = { version = "0.4.0", features = ["proptests"] }
# oci-spec = { version = "0.4.0", features = ["proptests"] }
oci-spec = { git = "https://github.com/utam0k/oci-spec-rs/", tag = "v0.4.0-with-bugfix", features = ["proptests"] }
quickcheck = "1"
clap = "2"
serde = { version = "1.0", features = ["derive"] }

1
src/rootfs.rs
View File

@ -224,6 +224,7 @@ fn bind_dev(rootfs: &Path, dev: &LinuxDevice) -> Result<()> {
fn to_sflag(dev_type: LinuxDeviceType) -> SFlag {
match dev_type {
LinuxDeviceType::A => SFlag::S_IFBLK | SFlag::S_IFCHR | SFlag::S_IFIFO,
LinuxDeviceType::B => SFlag::S_IFBLK,
LinuxDeviceType::C | LinuxDeviceType::U => SFlag::S_IFCHR,
LinuxDeviceType::P => SFlag::S_IFIFO,