From 209a00c292b83278854663f2bd3e099af7b444be Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Tue, 8 Jun 2021 09:22:25 -0700 Subject: [PATCH] import #1967326 --- .gitignore | 1 + libbpf-cargo-fix-metadata.diff | 11 ++++ rust-libbpf-cargo.spec | 104 +++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 117 insertions(+) create mode 100644 .gitignore create mode 100644 libbpf-cargo-fix-metadata.diff create mode 100644 rust-libbpf-cargo.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cd8a3e6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/libbpf-cargo-0.7.1.crate diff --git a/libbpf-cargo-fix-metadata.diff b/libbpf-cargo-fix-metadata.diff new file mode 100644 index 0000000..a41f527 --- /dev/null +++ b/libbpf-cargo-fix-metadata.diff @@ -0,0 +1,11 @@ +--- libbpf-cargo-0.7.1/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ libbpf-cargo-0.7.1/Cargo.toml 2021-06-08T16:23:09.243501+00:00 +@@ -36,7 +36,7 @@ + version = "0.12" + + [dependencies.libbpf-sys] +-version = "0.3.0-2" ++version = "0.4.0-1" + + [dependencies.memmap] + version = "0.7" diff --git a/rust-libbpf-cargo.spec b/rust-libbpf-cargo.spec new file mode 100644 index 0000000..8772b52 --- /dev/null +++ b/rust-libbpf-cargo.spec @@ -0,0 +1,104 @@ +# Generated by rust2rpm 17 +%bcond_without check + +%global crate libbpf-cargo + +Name: rust-%{crate} +Version: 0.7.1 +Release: 1%{?dist} +Summary: Cargo plugin to build bpf programs + +# Upstream license specification: LGPL-2.1 OR BSD-2-Clause +License: LGPLv2 or BSD +URL: https://crates.io/crates/libbpf-cargo +Source: %{crates_source} +# Bump libbpf-sys to 0.4.0-1: https://github.com/libbpf/libbpf-rs/pull/112 +Patch0: libbpf-cargo-fix-metadata.diff + +ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif + +BuildRequires: rust-packaging +%if %{with check} +BuildRequires: clang +BuildRequires: rustfmt +%endif + +%global _description %{expand: +Cargo plugin to build bpf programs.} + +%description %{_description} + +%if ! %{__cargo_skip_build} +%package -n %{crate} +Summary: %{summary} + +%description -n %{crate} %{_description} + +%files -n %{crate} +%license LICENSE LICENSE.BSD-2-Clause LICENSE.LPGL-2.1 +%doc README.md +%{_bindir}/cargo-libbpf +%endif + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE LICENSE.BSD-2-Clause LICENSE.LPGL-2.1 +%doc README.md +%{cargo_registry}/%{crate}-%{version_no_tilde}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +# These tests don't work when run outside of the git repo +# https://github.com/libbpf/libbpf-rs/issues/107 +%cargo_test -- -- \ + --skip test_skeleton_basic \ + --skip test_skeleton_builder_basic \ + --skip test_skeleton_datasec \ + --skip test_skeleton_empty_source +%endif + +%changelog +* Thu Jun 03 2021 Davide Cavalca - 0.7.1-1 +- Update to 0.7.1 +- Build for all architectures +- Enable tests by default and gate out the ones that don't work +- Backport PR#112 to bump libbpf-sys to 0.4.0-1 + +* Wed Jun 02 2021 Davide Cavalca - 0.7.0-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..60c4cd6 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libbpf-cargo-0.7.1.crate) = a8c6320057d9ff5944bf6001bf07ea3545208e6628eabe714b9684fe16e53aa5e8b92a48fe627ceeca2d36def97b56a30352c91a590fc7983987000ef1a57b7a