Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: change tar-rs to upstream version #1396

Merged
merged 2 commits into from
Aug 8, 2023
Merged

deps: change tar-rs to upstream version #1396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a04136
cargo: update rafs/storage/api/utils in cargo.lock
adamqqqplay Aug 8, 2023
96e9f86
deps: change tar-rs to upstream version
adamqqqplay Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 3 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ nix = "0.24.0"
rlimit = "0.9.0"
serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
serde_json = "1.0.51"
tar = "0.4.38"
tar = "0.4.40"
tokio = { version = "1.24", features = ["macros"] }

# Build static linked openssl library
Expand All @@ -74,7 +74,7 @@ vmm-sys-util = { version = "0.11.0", optional = true }
time = { version = "0.3.14", features = ["formatting"] }

[dev-dependencies]
xattr = "0.2.3"
xattr = "1.0.1"
vmm-sys-util = "0.11.0"

[features]
Expand Down Expand Up @@ -106,8 +106,4 @@ backend-registry = ["nydus-storage/backend-registry"]
backend-s3 = ["nydus-storage/backend-s3"]

[workspace]
members = ["api", "builder", "clib", "rafs", "storage", "service", "utils"]

[patch.crates-io]
# Due to the slow processing of PR by the upstream, temporarily fork tar-rs for this project
tar = { git = "https://github.com/nydusaccelerator/tar-rs.git" }
members = ["api", "builder", "clib", "rafs", "storage", "service", "utils"]
4 changes: 2 additions & 2 deletions builder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ nix = "0.24"
serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
serde_json = "1.0.53"
sha2 = "0.10.2"
tar = "0.4.38"
tar = "0.4.40"
vmm-sys-util = "0.11.0"
xattr = "0.2.3"
xattr = "1.0.1"

nydus-api = { version = "0.3", path = "../api" }
nydus-rafs = { version = "0.3", path = "../rafs" }
Expand Down
4 changes: 2 additions & 2 deletions storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
serde_json = "1.0.53"
sha1 = { version = "0.10.5", optional = true }
sha2 = { version = "0.10.2", optional = true }
tar = "0.4.38"
tar = "0.4.40"
time = { version = "0.3.14", features = ["formatting"], optional = true }
tokio = { version = "1.19.0", features = ["macros", "rt", "rt-multi-thread", "sync", "time"] }
url = { version = "2.1.1", optional = true }
Expand All @@ -41,7 +41,7 @@ nydus-utils = { version = "0.4", path = "../utils", features = ["encryption", "z

[dev-dependencies]
vmm-sys-util = "0.11"
tar = "0.4.38"
tar = "0.4.40"
regex = "1.7.0"

[features]
Expand Down
2 changes: 1 addition & 1 deletion utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ flate2 = { version = "1.0.17", features = ["zlib-ng-compat"], default-features =

[dev-dependencies]
vmm-sys-util = "0.11.0"
tar = "0.4.38"
tar = "0.4.40"

[features]
zran = ["libz-sys"]
Expand Down