The package rpms/rust-libbpf-rs.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-libbpf-rs.git/commit/?id=84809e....
Change: -ExclusiveArch: %{rust_arches}
Thanks.
Full change: ============
commit e054d2f73a1c887615c832c2580b1c2f1118ef12 Author: Michel Alexandre Salim salimma@fedoraproject.org Date: Fri Jan 27 12:46:47 2023 -0600
Use libbpf-sys with vendored libbpf, as the system libbpf is too old
Signed-off-by: Michel Alexandre Salim salimma@fedoraproject.org
diff --git a/libbpf-rs-fix-metadata.diff b/libbpf-rs-fix-metadata.diff index 38a1d42..3d6a8f8 100644 --- a/libbpf-rs-fix-metadata.diff +++ b/libbpf-rs-fix-metadata.diff @@ -9,11 +9,3 @@
[dependencies.thiserror] version = "1.0" -@@ -61,6 +61,7 @@ - version = "0.5" - - [features] -+default = ["novendor"] - novendor = ["libbpf-sys/novendor"] - static = ["libbpf-sys/static"] - [badges.maintenance] diff --git a/rust-libbpf-rs.spec b/rust-libbpf-rs.spec index 5116ef3..129459d 100644 --- a/rust-libbpf-rs.spec +++ b/rust-libbpf-rs.spec @@ -13,7 +13,6 @@ License: LGPL-2.1 OR BSD-2-Clause URL: https://crates.io/crates/libbpf-rs Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# - Turn on the novendor feature by default # - bump strum_macros dependency to 0.24 Patch: libbpf-rs-fix-metadata.diff
commit 5fb8f67bcf14d19e63f5fc6a8d5c4bbb054881a3 Author: Michel Alexandre Salim salimma@fedoraproject.org Date: Fri Jan 27 12:44:50 2023 -0600
Remove unused patches
diff --git a/libbpf-rs-downgrade-libbpf-sys-040.patch b/libbpf-rs-downgrade-libbpf-sys-040.patch deleted file mode 100644 index 0f00568..0000000 --- a/libbpf-rs-downgrade-libbpf-sys-040.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -ruN libbpf-rs-0.16.0/Cargo.toml libbpf-rs-0.16.0-downgrade-to-0.4.0/Cargo.toml ---- libbpf-rs-0.16.0/Cargo.toml 1969-12-31 16:00:01.000000000 -0800 -+++ libbpf-rs-0.16.0-downgrade-to-0.4.0/Cargo.toml 2022-02-15 16:15:59.255663607 -0800 -@@ -27,7 +27,7 @@ - version = "1.4" - - [dependencies.libbpf-sys] --version = "0.6.0-1" -+version = "0.4.0-2" - - [dependencies.nix] - version = "0.22" -diff -ruN libbpf-rs-0.16.0/src/object.rs libbpf-rs-0.16.0-downgrade-to-0.4.0/src/object.rs ---- libbpf-rs-0.16.0/src/object.rs 1973-11-29 13:33:09.000000000 -0800 -+++ libbpf-rs-0.16.0-downgrade-to-0.4.0/src/object.rs 2022-02-15 16:15:43.089602484 -0800 -@@ -53,9 +53,6 @@ - pin_root_path: ptr::null(), - attach_prog_fd: 0, - kconfig: ptr::null(), -- btf_custom_path: ptr::null(), -- __bindgen_padding_0: <[u8; 6]>::default(), -- __bindgen_padding_1: <[u8; 4]>::default(), - } - } - -diff -ruN libbpf-rs-0.16.0/src/perf_buffer.rs libbpf-rs-0.16.0-downgrade-to-0.4.0/src/perf_buffer.rs ---- libbpf-rs-0.16.0/src/perf_buffer.rs 1973-11-29 13:33:09.000000000 -0800 -+++ libbpf-rs-0.16.0-downgrade-to-0.4.0/src/perf_buffer.rs 2022-02-15 16:20:53.001774261 -0800 -@@ -106,15 +106,14 @@ - lost_cb: self.lost_cb, - })); - -+ let opts = libbpf_sys::perf_buffer_opts { -+ sample_cb: c_sample_cb, -+ lost_cb: c_lost_cb, -+ ctx: callback_struct_ptr as *mut _, -+ }; -+ - let ptr = unsafe { -- libbpf_sys::perf_buffer__new( -- self.map.fd(), -- self.pages as libbpf_sys::size_t, -- c_sample_cb, -- c_lost_cb, -- callback_struct_ptr as *mut _, -- std::ptr::null(), -- ) -+ libbpf_sys::perf_buffer__new(self.map.fd(), self.pages as libbpf_sys::size_t, &opts) - }; - let err = unsafe { libbpf_sys::libbpf_get_error(ptr as *const _) }; - if err != 0 { diff --git a/libbpf-rs-downgrade-libbpf-sys-050.patch b/libbpf-rs-downgrade-libbpf-sys-050.patch deleted file mode 100644 index cf26193..0000000 --- a/libbpf-rs-downgrade-libbpf-sys-050.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ruN libbpf-rs-0.16.0/Cargo.toml libbpf-rs-0.16.0-downgrade-to-0.5.0/Cargo.toml ---- libbpf-rs-0.16.0/Cargo.toml 1969-12-31 16:00:01.000000000 -0800 -+++ libbpf-rs-0.16.0-downgrade-to-0.5.0/Cargo.toml 2022-02-15 15:44:14.990476446 -0800 -@@ -27,7 +27,7 @@ - version = "1.4" - - [dependencies.libbpf-sys] --version = "0.6.0-1" -+version = "0.5.0-2" - - [dependencies.nix] - version = "0.22" -diff -ruN libbpf-rs-0.16.0/src/perf_buffer.rs libbpf-rs-0.16.0-downgrade-to-0.5.0/src/perf_buffer.rs ---- libbpf-rs-0.16.0/src/perf_buffer.rs 1973-11-29 13:33:09.000000000 -0800 -+++ libbpf-rs-0.16.0-downgrade-to-0.5.0/src/perf_buffer.rs 2022-02-15 15:43:29.766306029 -0800 -@@ -106,15 +106,14 @@ - lost_cb: self.lost_cb, - })); - -+ let opts = libbpf_sys::perf_buffer_opts { -+ sample_cb: c_sample_cb, -+ lost_cb: c_lost_cb, -+ ctx: callback_struct_ptr as *mut _, -+ }; -+ - let ptr = unsafe { -- libbpf_sys::perf_buffer__new( -- self.map.fd(), -- self.pages as libbpf_sys::size_t, -- c_sample_cb, -- c_lost_cb, -- callback_struct_ptr as *mut _, -- std::ptr::null(), -- ) -+ libbpf_sys::perf_buffer__new(self.map.fd(), self.pages as libbpf_sys::size_t, &opts) - }; - let err = unsafe { libbpf_sys::libbpf_get_error(ptr as *const _) }; - if err != 0 {
commit ed99f1c707946dc89427f9c4b0f3e36a6c3b2c9a Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Jan 20 23:42:19 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
commit 84809eccf9d459514d6f2e12bf752c554244c1bb Author: Michel Alexandre Salim salimma@fedoraproject.org Date: Thu Dec 8 21:10:25 2022 -0600
Update to 0.19.1
Signed-off-by: Michel Alexandre Salim salimma@fedoraproject.org
diff --git a/.gitignore b/.gitignore index 728c321..c048126 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /libbpf-rs-0.13.0.crate /libbpf-rs-0.14.0.crate /libbpf-rs-0.16.0.crate +/libbpf-rs-0.19.1.crate diff --git a/libbpf-rs-fix-metadata.diff b/libbpf-rs-fix-metadata.diff index 37d5a8f..38a1d42 100644 --- a/libbpf-rs-fix-metadata.diff +++ b/libbpf-rs-fix-metadata.diff @@ -1,10 +1,19 @@ ---- libbpf-rs-0.16.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ libbpf-rs-0.16.0/Cargo.toml 2022-02-15T19:34:00.245553+00:00 -@@ -59,6 +59,7 @@ +--- libbpf-rs-0.19.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libbpf-rs-0.19.1/Cargo.toml 2022-12-09T03:20:15.155206+00:00 +@@ -38,7 +38,7 @@ + version = "0.5" + + [dependencies.strum_macros] +-version = "0.23" ++version = "0.24" + + [dependencies.thiserror] + version = "1.0" +@@ -61,6 +61,7 @@ version = "0.5"
[features] +default = ["novendor"] novendor = ["libbpf-sys/novendor"] + static = ["libbpf-sys/static"] [badges.maintenance] - status = "actively-developed" diff --git a/rust-libbpf-rs.spec b/rust-libbpf-rs.spec index 5c23446..5116ef3 100644 --- a/rust-libbpf-rs.spec +++ b/rust-libbpf-rs.spec @@ -1,29 +1,23 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil}
%global crate libbpf-rs
-Name: rust-%{crate} -Version: 0.16.0 +Name: rust-libbpf-rs +Version: 0.19.1 Release: %autorelease Summary: Safe, idiomatic, and opinionated wrapper around libbpf-sys
-# Upstream license specification: LGPL-2.1 OR BSD-2-Clause -License: LGPLv2 or BSD +License: LGPL-2.1 OR BSD-2-Clause 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-040.patch -# Downgrade libbpf-sys to 0.5.0-2 (for Fedora 36) -Patch2: libbpf-rs-downgrade-libbpf-sys-050.patch +# Manually created patch for downstream crate metadata changes +# - Turn on the novendor feature by default +# - bump strum_macros dependency to 0.24 +Patch: libbpf-rs-fix-metadata.diff
-ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21
%global _description %{expand: Safe, idiomatic, and opinionated wrapper around libbpf-sys.} @@ -40,9 +34,11 @@ This package contains library source intended for building other packages which use the "%{crate}" crate.
%files devel -%license LICENSE LICENSE.BSD-2-Clause LICENSE.LPGL-2.1 -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%license %{crate_instdir}/LICENSE.BSD-2-Clause +%license %{crate_instdir}/LICENSE.LPGL-2.1 +%doc %{crate_instdir}/README.md +%{crate_instdir}/
%package -n %{name}+default-devel Summary: %{summary} @@ -54,7 +50,7 @@ This package contains library source intended for building other packages which use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+novendor-devel Summary: %{summary} @@ -66,20 +62,22 @@ This package contains library source intended for building other packages which use the "novendor" feature of the "%{crate}" crate.
%files -n %{name}+novendor-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+static-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+static-devel %{_description} + +This package contains library source intended for building other packages which +use the "static" feature of the "%{crate}" crate. + +%files -n %{name}+static-devel +%ghost %{crate_instdir}/Cargo.toml
%prep -%setup -q -n %{crate}-%{version_no_tilde} -%patch0 -p1 -%if 0%{?fedora} < 36 -%patch1 -p1 -%else -%if 0%{?fc36} -%patch2 -p1 -%else -sed -i -e 's/version = "0.6.0-1"/version = "0.6.1-2"/' Cargo.toml -%endif -%endif +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep
%generate_buildrequires @@ -95,6 +93,7 @@ sed -i -e 's/version = "0.6.0-1"/version = "0.6.1-2"/' Cargo.toml %check # most of these tests fail, RLIMIT_MEMLOCK does not work in mock rm tests/test.rs +rm tests/test_tc.rs %cargo_test %endif
diff --git a/sources b/sources index 34bf409..22a9b46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libbpf-rs-0.16.0.crate) = df3f928dbe0e9e7272ada339eec55080e6b32f01f9dc6552b59b02e2f0b46c4a23ae84ffca4e48e4d3d69325d4d0f1d4c3e0442e48922edf42baa482c4dfe102 +SHA512 (libbpf-rs-0.19.1.crate) = 44dd68ae101c5aa65bce4a887101fb5f448326fc3cfac645fff960724770a1a1bf7cbab0172467f4b0c3031c7d279385ea3e2c03ca8f85345ef0e55432a0f146
commit 049210e7fabb180d62b43a3077b6c6c11f65cd91 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Jul 23 04:52:30 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org