Skip to content

Commit

Permalink
deps: change tar-rs to upstream version
Browse files Browse the repository at this point in the history
Since upstream tar-rs merged our fix for reading large uids/gids from
the PAX extension, so change tar-rs back to the upstream version.

Update tar-rs dependency xattr to 1.0.1 as well.

Signed-off-by: Qinqi Qu <quqinqi@linux.alibaba.com>
  • Loading branch information
adamqqqplay committed Aug 8, 2023
1 parent c9792e2 commit f758b2e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
13 changes: 7 additions & 6 deletions Cargo.lock

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

8 changes: 2 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ sha2 = "0.10.2"
tar = "0.4.38"
tokio = { version = "1.24", features = ["macros"] }
vmm-sys-util = "0.11.0"
xattr = "0.2.3"
xattr = "1.0.1"

# Build static linked openssl library
openssl = { version = "0.10.55", features = ["vendored"] }
Expand Down Expand Up @@ -97,8 +97,4 @@ backend-registry = ["nydus-storage/backend-registry"]
backend-s3 = ["nydus-storage/backend-s3"]

[workspace]
members = ["api", "app", "blobfs", "clib", "error", "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", "app", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]
2 changes: 1 addition & 1 deletion builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ serde_json = "1.0.53"
sha2 = "0.10.2"
tar = "0.4.38"
vmm-sys-util = "0.10.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

0 comments on commit f758b2e

Please sign in to comment.