From 4d2abc3998c5fd8ec2ada1df7adb9fbc75a71ddb Mon Sep 17 00:00:00 2001 From: mulhern Date: Wed, 20 Dec 2023 13:48:57 -0500 Subject: [PATCH] Temporarily redirect to stratis-storage package Signed-off-by: mulhern --- Cargo.lock | 23 ++++++----------------- Cargo.toml | 7 +------ 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cd320410a28..1987e645d78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -411,17 +411,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - [[package]] name = "errno" version = "0.3.1" @@ -837,12 +826,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] -name = "loopdev" -version = "0.4.0" -source = "git+https://github.com/mulkieran/loopdev?branch=bump-bindgen-reduce-version-0.68.1#63e6105d5599d9df00041de873d7fc91f53b9f20" +name = "loopdev-3" +version = "0.5.0" +source = "git+https://github.com/stratis-storage/loopdev-3#abbc6befdfdfa57b7f3e96e5440fabff65a13aad" dependencies = [ "bindgen", - "errno 0.2.8", + "errno", "libc", ] @@ -1175,7 +1164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ "bitflags 1.3.2", - "errno 0.3.1", + "errno", "io-lifetimes", "libc", "linux-raw-sys", @@ -1317,7 +1306,7 @@ dependencies = [ "libmount", "libudev", "log", - "loopdev", + "loopdev-3", "nix 0.27.1", "pkg-config", "predicates", diff --git a/Cargo.toml b/Cargo.toml index a8051e817f7..a18b52f86e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -231,7 +231,7 @@ optional = true [dev-dependencies] assert_cmd = "2.0.8" assert_matches = "1.5.0" -loopdev = "0.4.0" +loopdev-3 = { version = "0.5.0", git = "https://github.com/stratis-storage/loopdev-3"} predicates = "3.0.0" proptest = "1.0.0" @@ -278,11 +278,6 @@ min = ["termios"] systemd_compat = ["bindgen"] udev_scripts = ["data-encoding"] -# FIXME: remove when loopdev dependency lower bound is increased from 0.4.0 -[patch.crates-io.loopdev] -git = "https://github.com/mulkieran/loopdev" -branch = "bump-bindgen-reduce-version-0.68.1" - [package.metadata.vendor-filter] platforms = ["*-unknown-linux-gnu"] tier = "2"