diff --git a/libbpf-rs-downgrade-libbpf-sys.patch b/libbpf-rs-downgrade-libbpf-sys.patch new file mode 100644 index 0000000..99ee96b --- /dev/null +++ b/libbpf-rs-downgrade-libbpf-sys.patch @@ -0,0 +1,23 @@ +diff -Naur a/Cargo.toml b/Cargo.toml +--- a/Cargo.toml 2021-10-24 12:22:44.163859672 -0700 ++++ b/Cargo.toml 2021-10-24 12:21:45.897083132 -0700 +@@ -24,7 +24,7 @@ + version = "1.3" + + [dependencies.libbpf-sys] +-version = "0.5.0-1" ++version = "0.4.0-2" + + [dependencies.nix] + version = "0.22" +diff -Naur a/src/object.rs b/src/object.rs +--- a/src/object.rs 1973-11-29 13:33:09.000000000 -0800 ++++ b/src/object.rs 2021-10-24 12:21:56.128219497 -0700 +@@ -67,7 +67,6 @@ + pin_root_path: ptr::null(), + attach_prog_fd: 0, + kconfig: ptr::null(), +- btf_custom_path: ptr::null(), + } + } + diff --git a/rust-libbpf-rs.spec b/rust-libbpf-rs.spec index e748ff1..695c3c6 100644 --- a/rust-libbpf-rs.spec +++ b/rust-libbpf-rs.spec @@ -16,6 +16,9 @@ URL: https://crates.io/crates/libbpf-rs Source: %{crates_source} # Turn on the novendor feature by default Patch0: libbpf-rs-fix-metadata.diff +# Downgrade libbpf-sys to 0.4.0-2; this patch is meant for Fedora 35 and lower +# where libbpf is still at 0.4.0 +Patch1: libbpf-rs-downgrade-libbpf-sys.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -68,7 +71,11 @@ which use "novendor" feature of "%{crate}" crate. %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%setup -q -n %{crate}-%{version_no_tilde} +%patch0 -p1 +%if 0%{?fedora} < 36 +%patch1 -p1 +%endif %cargo_prep %generate_buildrequires