From d38683c14c372d2dcdaeb0b6e03075bc44137f1f Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Wed, 24 Jan 2024 16:52:26 +0100 Subject: [PATCH] ci: workaround inability to use specify a feature in a cargo patch For some undocumented reason we're not allowed to make use of features added by the patched dependency we want to use. Signed-off-by: Yann Dirson --- devscripts/cargo-freebsd-netlink.toml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/devscripts/cargo-freebsd-netlink.toml b/devscripts/cargo-freebsd-netlink.toml index 99fa7fc..329bb68 100644 --- a/devscripts/cargo-freebsd-netlink.toml +++ b/devscripts/cargo-freebsd-netlink.toml @@ -1,3 +1,10 @@ -[patch.crates-io] -libc = { git = "https://github.com/xcp-ng/rust-libc.git", branch = "freebsd-netlink-0.2" } -rtnetlink = { git = "https://github.com/xcp-ng/rust-rtnetlink.git", branch = "freebsd" } +[patch.crates-io.libc] +git = "https://github.com/xcp-ng/rust-libc.git" +#branch = "freebsd-netlink-0.2" +# cannot specify a cargo feature here, so use a version exposing +# freebsd-netlink support without needing a feature +rev = "bfe4c69a83a9e6fc4fe92867c7ebbc471b723ccb" + +[patch.crates-io.rtnetlink] +git = "https://github.com/xcp-ng/rust-rtnetlink.git" +branch = "freebsd" -- 2.39.5